Merge branch 'master' of github.com:Katharineum/school-apps

README.md

schoolapps/aub/migrations/0001_initial.py

schoolapps/aub/migrations/0002_remove_aub_x.py

schoolapps/aub/migrations/0003_auto_20171221_1206.py

schoolapps/aub/migrations/0004_auto_20171222_1722.py

schoolapps/aub/migrations/0005_auto_20171222_1723.py

schoolapps/aub/migrations/0006_auto_20171222_1736.py

schoolapps/aub/migrations/0007_auto_20171222_1738.py

schoolapps/aub/migrations/0008_status.py

schoolapps/aub/migrations/0009_aub_status.py

schoolapps/aub/migrations/0010_auto_20180101_1634.py

schoolapps/aub/migrations/0011_auto_20180101_1722.py

schoolapps/aub/migrations/0012_auto_20180101_1748.py

schoolapps/aub/migrations/__init__.py

schoolapps/dashboard/migrations/0001_initial.py

schoolapps/dashboard/migrations/0002_activity_user.py

schoolapps/dashboard/migrations/0003_activity_created_at.py

schoolapps/dashboard/migrations/0004_notification.py

schoolapps/dashboard/migrations/0005_auto_20171222_1722.py

schoolapps/dashboard/migrations/__init__.py