Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # ~dev_rating/application/bootstrap.php
Showing
- db/StoredProcedures.sql 59 additions, 33 deletionsdb/StoredProcedures.sql
- ~dev_rating/application/bootstrap.php 6 additions, 13 deletions~dev_rating/application/bootstrap.php
- ~dev_rating/application/classes/Controller/Teacher/Rating.php 103 additions, 118 deletions..._rating/application/classes/Controller/Teacher/Rating.php
- ~dev_rating/application/views/teacher/rating.twig 3 additions, 3 deletions~dev_rating/application/views/teacher/rating.twig
- ~dev_rating/media/js/rating.js 58 additions, 50 deletions~dev_rating/media/js/rating.js
Please register or sign in to comment