Skip to content
Snippets Groups Projects
Commit de03932a authored by Andrew Rudenets's avatar 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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment