Merge branch 'master' into use_rst

mkoistinen · mkoistinen · commit b09980b4f104 · 2015-12-02T16:44:52.000-05:00
# Conflicts:
#	MANIFEST.in
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,5 @@
 include LICENSE.txt
 include README.rst
-recursive-include djangocms_file/migrations *
-recursive-include djangocms_file/south_migrations *
 recursive-include djangocms_file/locale *
 recursive-include djangocms_file/templates *
 recursive-exclude * *.py[co]
