diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-16 17:05:27 -0600 |
commit | a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf (patch) | |
tree | 5bf13b5605e40c755e20edf9be45e3a20308d5dd /context.py | |
parent | fa30dc90be82aa0f818e14110e9b86373f7c8a35 (diff) | |
parent | f15cb4dc7d9284a24f75dc8b56248916140ceb09 (diff) | |
download | askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.gz askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.tar.bz2 askbot-a32975a5d8acf5fa54f544271e2cfb9e92bbf8bf.zip |
Merge branch 'evgenyfadeev/master'
Conflicts:
locale/en/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
Diffstat (limited to 'context.py')
-rw-r--r-- | context.py | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -10,6 +10,7 @@ def application_settings(context): 'LANGUAGE_CODE': settings.LANGUAGE_CODE, 'GOOGLE_SITEMAP_CODE':settings.GOOGLE_SITEMAP_CODE, 'GOOGLE_ANALYTICS_KEY':settings.GOOGLE_ANALYTICS_KEY, + 'BOOKS_ON':settings.BOOKS_ON, } return {'settings':my_settings} |