fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'obrazy' into rwd
[wolnelektury.git]
/
wolnelektury
/
settings
/
__init__.py
diff --git
a/wolnelektury/settings/__init__.py
b/wolnelektury/settings/__init__.py
index
1f0d1d2
..
8d7c00f
100644
(file)
--- a/
wolnelektury/settings/__init__.py
+++ b/
wolnelektury/settings/__init__.py
@@
-65,8
+65,15
@@
INSTALLED_APPS_OUR = [
'waiter',
'search',
'oai',
'waiter',
'search',
'oai',
+ 'funding',
+ 'polls',
+ 'libraries',
]
]
+GETPAID_BACKENDS = (
+ 'getpaid.backends.payu',
+)
+
INSTALLED_APPS_CONTRIB = [
# external
'django.contrib.auth',
INSTALLED_APPS_CONTRIB = [
# external
'django.contrib.auth',
@@
-87,6
+94,9
@@
INSTALLED_APPS_CONTRIB = [
'djkombu',
'honeypot',
#'django_nose',
'djkombu',
'honeypot',
#'django_nose',
+ 'fnpdjango',
+ 'getpaid',
+ 'getpaid.backends.payu',
#allauth stuff
'uni_form',
#allauth stuff
'uni_form',