Commit 852c803a authored by Adrian Lance Damalerio's avatar Adrian Lance Damalerio

Merge branch 'master' into dashboard_wip

parents 1d91fd3a f97b37fb
...@@ -35,7 +35,7 @@ ALLOWED_HOSTS = [] ...@@ -35,7 +35,7 @@ ALLOWED_HOSTS = []
INSTALLED_APPS = [ INSTALLED_APPS = [
"announcement_board", "announcement_board",
"assignments", "assignments",
"calendar_app" "calendar_app",
"dashboard", "dashboard",
"forum", "forum",
"django.contrib.admin", "django.contrib.admin",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment