Merge branch 'feature/formal-things' into dev-1.1.1
# Conflicts: # schoolapps/dashboard/urls.py # schoolapps/dashboard/views.py # schoolapps/templates/partials/footer.html
No related branches found
No related tags found
Showing
- COPYRIGHT 0 additions, 2 deletionsCOPYRIGHT
- COPYRIGHT.md 2 additions, 0 deletionsCOPYRIGHT.md
- README.md 2 additions, 2 deletionsREADME.md
- requirements.txt 1 addition, 1 deletionrequirements.txt
- schoolapps/dashboard/urls.py 1 addition, 0 deletionsschoolapps/dashboard/urls.py
- schoolapps/dashboard/views.py 3 additions, 0 deletionsschoolapps/dashboard/views.py
- schoolapps/meta.py 56 additions, 0 deletionsschoolapps/meta.py
- schoolapps/schoolapps/settings.py 1 addition, 0 deletionsschoolapps/schoolapps/settings.py
- schoolapps/templates/common/about.html 63 additions, 0 deletionsschoolapps/templates/common/about.html
- schoolapps/templates/partials/footer.html 34 additions, 24 deletionsschoolapps/templates/partials/footer.html
COPYRIGHT
deleted
100644 → 0
COPYRIGHT.md
0 → 100644
... | ... | @@ -3,7 +3,7 @@ mysqlclient |
django | ||
django-auth-ldap | ||
django-dbsettings | ||
django_pdb | ||
django-pdb | ||
django-material | ||
django-filter | ||
django_react_templatetags | ||
... | ... |
schoolapps/dashboard/views.py
0 → 100755
schoolapps/meta.py
0 → 100644
schoolapps/templates/common/about.html
0 → 100644
Please register or sign in to comment