Merge branch 'master' into quizzes

[oweals/karmaworld.git] / karmaworld / settings / common.py

diff --git a/karmaworld/settings/common.py b/karmaworld/settings/common.py
index 8993be64f3a87bb8b1356d93e5f116e5df00e10c..ba72913d57c4f57ce79f1616278e86641a3444cc 100644 (file)
--- a/karmaworld/settings/common.py
+++ b/karmaworld/settings/common.py
@@ -242,6 +242,9 @@ THIRD_PARTY_APPS = (
     'allauth.socialaccount.providers.facebook',
     'allauth.socialaccount.providers.google',
     'allauth.socialaccount.providers.twitter',
+
+    # Added to make quizzes moderation nicer
+    'nested_inlines',
 )
 
 LOCAL_APPS = (
@@ -252,6 +255,7 @@ LOCAL_APPS = (
     'karmaworld.apps.users',
     'karmaworld.apps.moderation',
     'karmaworld.apps.licenses',
+    'karmaworld.apps.quizzes',
 )
 
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps