Skip to content
Snippets Groups Projects
Commit 7bb6faad authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Merge branch 'develop' into feature/gridv-6-mapserver-layer

parents 5ef1d880 78702b7e
No related branches found
No related tags found
1 merge request!12feat: Add test page (spatial) with mapserver layer in openlayers map
...@@ -156,7 +156,7 @@ INSTALLED_APPS = ( ...@@ -156,7 +156,7 @@ INSTALLED_APPS = (
TINYMCE_DEFAULT_CONFIG = { TINYMCE_DEFAULT_CONFIG = {
'theme': "silver", 'theme': "silver",
'relative_urls': False, 'relative_urls': False,
'plugins': 'link lists', 'plugins': 'link lists code image',
'toolbar': 'undo redo | styleselect | bold italic | bullist numlist | alignleft aligncenter alignright alignjustify | indent outdent | link unlink' 'toolbar': 'undo redo | styleselect | bold italic | bullist numlist | alignleft aligncenter alignright alignjustify | indent outdent | link unlink'
} }
TINYMCE_COMPRESSOR = False TINYMCE_COMPRESSOR = False
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment