summaryrefslogtreecommitdiffstats
path: root/settings.py
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-15 23:18:02 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2010-02-15 23:18:02 -0600
commit1e7bd132df5f56f397b555c7481a635c9d66a56a (patch)
tree54aac7789eb445d3d01eaea36f2956e386bb0086 /settings.py
parentd276802efa5899ccb568de1b4c445d54ea72c42d (diff)
parent89131389eb631456a0bdaa3a705488d43d0ced9b (diff)
downloadaskbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.gz
askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.tar.bz2
askbot-1e7bd132df5f56f397b555c7481a635c9d66a56a.zip
Merge commit 'osqa/master'
Conflicts: forum/skins/default/media/js/wmd/wmd.js forum/skins/default/templates/base.html forum/skins/default/templates/base_content.html forum/views.py locale/en/LC_MESSAGES/django.mo locale/en/LC_MESSAGES/django.po settings_local.py.dist
Diffstat (limited to 'settings.py')
-rwxr-xr-xsettings.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/settings.py b/settings.py
index 96c20cc3..775bda45 100755
--- a/settings.py
+++ b/settings.py
@@ -10,6 +10,7 @@ SECRET_KEY = '$oo^&_m&qwbib=(_4m_n*zn-d=g#s0he5fx9xonnym#8p6yigm'
TEMPLATE_LOADERS = (
'django.template.loaders.filesystem.load_template_source',
'django.template.loaders.app_directories.load_template_source',
+ 'forum.skins.load_template_source',
# 'django.template.loaders.eggs.load_template_source',
)
@@ -41,7 +42,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
ROOT_URLCONF = 'urls'
TEMPLATE_DIRS = (
- os.path.join(os.path.dirname(__file__), 'templates').replace('\\','/'),
+ os.path.join(os.path.dirname(__file__),'forum','skins').replace('\\','/'),
)
#UPLOAD SETTINGS