Merge branch 'dev'
# Conflicts: # schoolapps/templates/partials/footer.html
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 2 deletions.gitignore
- .idea/misc.xml 1 addition, 1 deletion.idea/misc.xml
- .idea/school-apps.iml 1 addition, 1 deletion.idea/school-apps.iml
- .idea/vcs.xml 2 additions, 1 deletion.idea/vcs.xml
- README.md 1 addition, 1 deletionREADME.md
- dynselect/src/App.js 26 additions, 3 deletionsdynselect/src/App.js
- dynselect/src/index.js 1 addition, 5 deletionsdynselect/src/index.js
- dynselect2/src/App.js 27 additions, 4 deletionsdynselect2/src/App.js
- schoolapps/aub/views.py 2 additions, 2 deletionsschoolapps/aub/views.py
- schoolapps/dashboard/views.py 2 additions, 1 deletionschoolapps/dashboard/views.py
- schoolapps/debug/migrations/0003_auto_20190818_0910.py 18 additions, 0 deletionsschoolapps/debug/migrations/0003_auto_20190818_0910.py
- schoolapps/debug/migrations/0004_auto_20190916_1450.py 18 additions, 0 deletionsschoolapps/debug/migrations/0004_auto_20190916_1450.py
- schoolapps/faq/urls.py 1 addition, 1 deletionschoolapps/faq/urls.py
- schoolapps/faq/views.py 4 additions, 2 deletionsschoolapps/faq/views.py
- schoolapps/schoolapps/urls.py 11 additions, 1 deletionschoolapps/schoolapps/urls.py
- schoolapps/static/common/helper.js 4 additions, 2 deletionsschoolapps/static/common/helper.js
- schoolapps/static/common/style.css 19 additions, 0 deletionsschoolapps/static/common/style.css
- schoolapps/static/support/bundle.js 15971 additions, 15942 deletionsschoolapps/static/support/bundle.js
- schoolapps/support/templates/support/mail/rebus.html 1 addition, 1 deletionschoolapps/support/templates/support/mail/rebus.html
- schoolapps/support/templates/support/mail/rebus.txt 1 addition, 1 deletionschoolapps/support/templates/support/mail/rebus.txt
Loading
Please register or sign in to comment