Merge branch 'devel' into feature-qr-code (6f2cad26) · 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 6f2cad26 authored 8 years ago by

Vitaliy Vashchenko

Browse files

Merge branch 'devel' into feature-qr-code

# Conflicts:
#	android/assets/text/application/application_cs.properties
#	core/src/cz/nic/tablexia/loader/application/ApplicationTextManager.java

parents 383e74fe e96b2230

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 154 additions and 115 deletions

Please register or to comment

Admin message

Admin message

Merge branch 'devel' into feature-qr-code