Merge branch 'feature/gulp' into develop

0307fb63 · PavelBegunkov · 0a845ebe · 8db7e5a2 · 0307fb63 · 0307fb63
Commit 0307fb63 authored 9 years ago by PavelBegunkov
--- a/~dev_rating/media/css/admin/stepByStep.css
+++ b/~dev_rating/media/css/admin/stepByStep.css
--- a/~dev_rating/media/css/discipline.css
+++ b/~dev_rating/media/css/discipline.css
--- a/~dev_rating/media/css/forms.css
+++ b/~dev_rating/media/css/forms.css
--- a/~dev_rating/media/css/inputGroup.css
+++ b/~dev_rating/media/css/inputGroup.css
--- a/~dev_rating/media/css/messages.css
+++ b/~dev_rating/media/css/messages.css
--- a/~dev_rating/media/css/pdf/activationTemplate.css
+++ b/~dev_rating/media/css/pdf/activationTemplate.css
--- a/~dev_rating/media/css/readme.md
+++ b/~dev_rating/media/css/readme.md
--- a/~dev_rating/media/js/admin/accounts/codes.js
+++ b/~dev_rating/media/js/admin/accounts/codes.js
--- a/~dev_rating/media/js/admin/students/add.js
+++ b/~dev_rating/media/js/admin/students/add.js
--- a/~dev_rating/media/js/admin/students/index.js
+++ b/~dev_rating/media/js/admin/students/index.js
--- a/~dev_rating/media/js/admin/students/upload.js
+++ b/~dev_rating/media/js/admin/students/upload.js
--- a/~dev_rating/media/js/admin/teachers/add.js
+++ b/~dev_rating/media/js/admin/teachers/add.js
--- a/~dev_rating/media/js/admin/teachers/index.js
+++ b/~dev_rating/media/js/admin/teachers/index.js
--- a/~dev_rating/media/js/admin/teachers/upload.js
+++ b/~dev_rating/media/js/admin/teachers/upload.js
--- a/~dev_rating/media/js/config.js
+++ b/~dev_rating/media/js/config.js
--- a/~dev_rating/media/js/dean_office/credits.js
+++ b/~dev_rating/media/js/dean_office/credits.js
--- a/~dev_rating/media/js/dean_office/dean_office.js
+++ b/~dev_rating/media/js/dean_office/dean_office.js
--- a/~dev_rating/media/js/discipline/CreateCoursework.js
+++ b/~dev_rating/media/js/discipline/CreateCoursework.js
--- a/~dev_rating/media/js/discipline/CreateDiscipline.js
+++ b/~dev_rating/media/js/discipline/CreateDiscipline.js
--- a/~dev_rating/media/js/discipline/DisciplineList.js
+++ b/~dev_rating/media/js/discipline/DisciplineList.js