Merge branch 'master' of http://git.task-on.com/ktask/task-on.com
Conflicts: common/modules/school/views/course/index.php common/modules/users/models/User.php frontend/config/main.php
Showing
Please register or sign in to comment
Conflicts: common/modules/school/views/course/index.php common/modules/users/models/User.php frontend/config/main.php
task-on.com - ООО "Арт Проект"