web/application/views/admin/base.twig · de03932a399ae2d460f8b82eeecb19a212494610 · Anton Yushko / grade

"web/application/views/settings.twig" did not exist on "4a335caef1c44a8f4256599af914fe3cd6d681ad"

Aug 22, 2014

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

Andrew Rudenets authored Aug 22, 2014

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

de03932a

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

Andrew Rudenets authored Aug 22, 2014

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