Merge branch 'master' into sunburnt

[wolnelektury.git] / wolnelektury / settings / __init__.py

diff --git a/wolnelektury/settings/__init__.py b/wolnelektury/settings/__init__.py
index f2314a9..db6ba45 100644 (file)
--- a/wolnelektury/settings/__init__.py
+++ b/wolnelektury/settings/__init__.py
@@ -63,6 +63,8 @@ INSTALLED_APPS_OUR = [
     'picture',
     'social',
     'waiter',
     'picture',
     'social',
     'waiter',

+    'search',
+    'oai',

     ]
 
 INSTALLED_APPS_CONTRIB = [
     ]
 
 INSTALLED_APPS_CONTRIB = [


@@ -84,7 +86,7 @@ INSTALLED_APPS_CONTRIB = [
     'djcelery',
     'djkombu',
     'honeypot',
     'djcelery',
     'djkombu',
     'honeypot',

-    #    'django_nose',
+    #'django_nose',

 
     #allauth stuff
     'emailconfirmation',
 
     #allauth stuff
     'emailconfirmation',