Merge branch 'feature-pauseresume' into devel (56d8f573) · 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 56d8f573 authored 9 years ago by

Luboš Horáček

Browse files

Merge branch 'feature-pauseresume' into devel

Conflicts:
	core/src/cz/nic/tablexia/game/GameDefinition.java
	ios/src/cz/nic/tablexia/IOSLauncher.java

parents 05b47be9 ada54788

Branches

Admin message

Admin message

Merge branch 'feature-pauseresume' into devel