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 /settings_local.py.dist | |
| 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 'settings_local.py.dist')
| -rw-r--r-- | settings_local.py.dist | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings_local.py.dist b/settings_local.py.dist index d6273070..48d7b567 100644 --- a/settings_local.py.dist +++ b/settings_local.py.dist @@ -44,4 +44,4 @@ EMAIL_UNIQUE = False APP_URL = 'http://server.com' #used by email notif system and RSS GOOGLE_SITEMAP_CODE = '55uGNnQVJW8p1bbXeF/Xbh9I7nZBM/wLhRz6N/I1kkA=' GOOGLE_ANALYTICS_KEY = '' - +BOOKS_ON = True |