Merge pull request #3499 from jsma/patch-1

Added warning in docs for Twitter plugins
django-cms · Oct 8, 2014 · 7da03d9 · 7da03d9
2 parents 1c16db5 + b60e3d3
commit 7da03d9
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/docs/basic_reference/plugin_reference.rst b/docs/basic_reference/plugin_reference.rst
@@ -281,6 +281,8 @@ We recommend one of the following plugins:
 * https://github.com/nephila/djangocms_twitter
 * https://github.com/changer/cmsplugin-twitter
 
+.. warning:: These plugins are not currently compatible with Django 1.7.
+
 .. :module:: djangocms_inherit
 
 .. :class:: djangocms_inherit.cms_plugins.InheritPagePlaceholderPlugin