Merge branch 'hotfix/placeholderblog'

This commit is contained in:
rascencio 2015-06-13 22:22:42 -06:00
commit 4c86433046

View file

@ -392,6 +392,17 @@ BLOG_POSTS_LIST_TRUNCWORDS_COUNT = 100
BLOG_MULTISITE = True
BLOG_AUTHOR_DEFAULT = True
CKEDITOR_SETTINGS = {
'language': '{{ language }}',
'toolbar_CMS': [
['Undo', 'Redo'],
['cmsplugins', '-', 'ShowBlocks'],
['Format', 'Styles'],
],
'skin': 'moono',
}
try:
from .local.local_settings import *
except ImportError as e: