amal/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'hotfix/ckeditor-conf' into develop

Browse source
This commit is contained in:
rascencio 2015-06-13 22:41:44 -06:00
commit 9c1dd92e21
1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dynamicweb/settings.py
View file

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