Merge branch 'hotfix/ckeditor-conf' into develop
This commit is contained in:
		
				commit
				
					
						9c1dd92e21
					
				
			
		
					 1 changed files with 0 additions and 11 deletions
				
			
		| 
						 | 
					@ -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:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue