Merge branch 'develop' of http://itlab.mmcs.sfedu.ru/git/grade-rating into develop
Conflicts: ~dev_rating/media/js/rating.js
Showing
- ~dev_rating/application/views/teacher/exam.twig 49 additions, 13 deletions~dev_rating/application/views/teacher/exam.twig
- ~dev_rating/docs/template credit.xls 0 additions, 0 deletions~dev_rating/docs/template credit.xls
- ~dev_rating/media/js/rating.js 10 additions, 0 deletions~dev_rating/media/js/rating.js
Please register or sign in to comment