Merge branch 'devel' into feature-usermenu - resolving conflicts caused by new server (7108794e) · 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 7108794e authored 9 years ago by

Anton Danilov

Browse files

Merge branch 'devel' into feature-usermenu - resolving conflicts caused by new server

Conflicts:
	core/src/cz/nic/tablexia/TablexiaApplication.java

parents 83da9d76 48761453

Branches

Admin message

Admin message

Merge branch 'devel' into feature-usermenu - resolving conflicts caused by new server