fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged with branch 1.0.
[wolnelektury.git]
/
wolnelektury
/
settings.py
diff --git
a/wolnelektury/settings.py
b/wolnelektury/settings.py
index
de4b2cc
..
bdbc992
100644
(file)
--- a/
wolnelektury/settings.py
+++ b/
wolnelektury/settings.py
@@
-75,7
+75,7
@@
MIDDLEWARE_CLASSES = [
'pagination.middleware.PaginationMiddleware',
]
'pagination.middleware.PaginationMiddleware',
]
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = '
wolnelektury.
urls'
TEMPLATE_DIRS = [
path.join(PROJECT_DIR, 'templates'),
TEMPLATE_DIRS = [
path.join(PROJECT_DIR, 'templates'),
@@
-95,6
+95,7
@@
INSTALLED_APPS = [
'django.contrib.admindocs',
# external
'django.contrib.admindocs',
# external
+ 'south',
'newtagging',
'pagination',
'chunks',
'newtagging',
'pagination',
'chunks',