Merge branch 'master' into wip/portail-entreprise

2014-03-20 16:53:25 +01:00 · 2014-03-20 16:53:25 +01:00 · b3876d0c0c
parent 29d373ae6f 8f4ded1106
commit b3876d0c0c
3 changed files with 3 additions and 0 deletions
--- a/portail_citoyen/settings.py
+++ b/portail_citoyen/settings.py
@ -140,6 +140,7 @@ INSTALLED_APPS = (
    'cms.plugins.teaser',
    'cms.plugins.video',
    'cmsplugin_text_wrapper',
+    'cms_ajax_text_plugin',
    'feed_plugin',
    'data_source_plugin',
    'a2_service_list_plugin',
--- a/requirements.txt
+++ b/requirements.txt
@ -11,3 +11,4 @@ django>=1.5.1,<1.6
 authentic2
 south>=0.8.4
 Pillow
+django-cms-ajax-text-plugin
--- a/setup.py
+++ b/setup.py
@ -123,6 +123,7 @@ setup(name="portail_citoyen",
            'django-cms>2.4.1,<2.4.2',
            'python-entrouvert',
            'south>=0.8.4',
+            'django-cms-ajax-text-plugin',
            'Pillow',
      ],
      dependency_links = [