fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'sunburnt' of git+ssh://san.fnp/home/staging/dev/application into sunburnt
[wolnelektury.git]
/
wolnelektury
/
settings
/
__init__.py
diff --git
a/wolnelektury/settings/__init__.py
b/wolnelektury/settings/__init__.py
index
15126b9
..
db6ba45
100644
(file)
--- a/
wolnelektury/settings/__init__.py
+++ b/
wolnelektury/settings/__init__.py
@@
-64,6
+64,7
@@
INSTALLED_APPS_OUR = [
'social',
'waiter',
'search',
+ 'oai',
]
INSTALLED_APPS_CONTRIB = [
@@
-85,7
+86,7
@@
INSTALLED_APPS_CONTRIB = [
'djcelery',
'djkombu',
'honeypot',
- #
'django_nose',
+ #'django_nose',
#allauth stuff
'emailconfirmation',