Merge branch 'hotfix/ReportsPrinter' into develop
Conflicts: db/StoredProcedures.sql ~dev_rating/application/classes/Controller/Handler/FileCreator.php ~dev_rating/application/classes/Model/Teacher/Rating.php
Showing
- ~dev_rating/application/classes/Controller/Handler/FileCreator.php 180 additions, 123 deletions...ng/application/classes/Controller/Handler/FileCreator.php
- ~dev_rating/media/js/discipline/EditStudents.js 1 addition, 1 deletion~dev_rating/media/js/discipline/EditStudents.js
- ~dev_rating/media/less/teacher/discipline/EditStudents.css 3 additions, 3 deletions~dev_rating/media/less/teacher/discipline/EditStudents.css
- ~dev_rating/media/less/teacher/discipline/EditStudents.less 3 additions, 2 deletions~dev_rating/media/less/teacher/discipline/EditStudents.less
This diff is collapsed.
Please register or sign in to comment