Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating (de03932a) · Commits · Anton Yushko / grade

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.

Commit de03932a authored 10 years ago by

Andrew Rudenets

Browse files

Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating

Conflicts:
	application/classes/Controller/Admin/Departaments.php
	application/classes/Controller/Teacher/Admin/Index.php
	web/application/classes/Controller/Teacher/Admin/Index.php
	web/application/classes/Model/Account.php

parents ad959dc3 88ceb036

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 244 additions and 75 deletions

Please register or to comment

Admin message

Merge branch 'master' of http://itlab.mmcs.sfedu.ru/git/grade-rating