Merge branch 'devel' into feature-sounds (d26b416e) · Commits · labs / Tablexia

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Self sign-up has been disabled due to increased spam activity. If you want to get access, please send an email to a project owner (preferred) or at gitlab(at)nic(dot)cz. We apologize for the inconvenience.

Commit d26b416e authored 8 years ago by

Drahomír Karchňák

Browse files

Merge branch 'devel' into feature-sounds

Conflicts:
	core/src/cz/nic/tablexia/TablexiaSettings.java
	core/src/cz/nic/tablexia/menu/AbstractMenu.java
	core/src/cz/nic/tablexia/menu/main/MainMenuDefinition.java

parents 829c408c 6956e733

Branches

Admin message

Admin message

Merge branch 'devel' into feature-sounds