Merge branch 'dev' into feature/pwa-optimization
# Conflicts: # schoolapps/dashboard/views.py # schoolapps/schoolapps/settings.py # schoolapps/schoolapps/urls.py # schoolapps/templates/common/404.html
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CHANGELOG.md 67 additions, 0 deletionsCHANGELOG.md
- COPYRIGHT 2 additions, 0 deletionsCOPYRIGHT
- INSTALL.md 101 additions, 0 deletionsINSTALL.md
- README.md 3 additions, 100 deletionsREADME.md
- schoolapps/dashboard/views.py 0 additions, 5 deletionsschoolapps/dashboard/views.py
- schoolapps/schoolapps/settings.py 25 additions, 2 deletionsschoolapps/schoolapps/settings.py
- schoolapps/schoolapps/urls.py 5 additions, 2 deletionsschoolapps/schoolapps/urls.py
- schoolapps/templates/404.html 21 additions, 0 deletionsschoolapps/templates/404.html
- schoolapps/templates/common/404.html 0 additions, 135 deletionsschoolapps/templates/common/404.html
- schoolapps/templatetags/templatetags/url_name.py 4 additions, 1 deletionschoolapps/templatetags/templatetags/url_name.py
CHANGELOG.md
0 → 100644
COPYRIGHT
0 → 100644
INSTALL.md
0 → 100644
schoolapps/templates/404.html
0 → 100755
Please register or sign in to comment