Merge branch 'master' into wip/portail-entreprise
This commit is contained in:
commit
b3876d0c0c
|
@ -140,6 +140,7 @@ INSTALLED_APPS = (
|
||||||
'cms.plugins.teaser',
|
'cms.plugins.teaser',
|
||||||
'cms.plugins.video',
|
'cms.plugins.video',
|
||||||
'cmsplugin_text_wrapper',
|
'cmsplugin_text_wrapper',
|
||||||
|
'cms_ajax_text_plugin',
|
||||||
'feed_plugin',
|
'feed_plugin',
|
||||||
'data_source_plugin',
|
'data_source_plugin',
|
||||||
'a2_service_list_plugin',
|
'a2_service_list_plugin',
|
||||||
|
|
|
@ -11,3 +11,4 @@ django>=1.5.1,<1.6
|
||||||
authentic2
|
authentic2
|
||||||
south>=0.8.4
|
south>=0.8.4
|
||||||
Pillow
|
Pillow
|
||||||
|
django-cms-ajax-text-plugin
|
||||||
|
|
Reference in New Issue