Merge branch 'master' of github.com:jdriscoll/django-photologue

richardbarran · Jan 29, 2018 · 9a2331e · 9a2331e
2 parents bc9452f + 57ba9f7
commit 9a2331e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: python
 
-# Although Django 1.8 supports Python 3.2, it's EOL, so we don't include it in the tests.
 python:
   - 2.7
   - 3.4

diff --git a/photologue/migrations/0002_photosize_data.py b/photologue/migrations/0002_photosize_data.py
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('photologue', '0001_initial'),
-        ('contenttypes', '0001_initial'),
+        ('contenttypes', '0002_remove_content_type_name'),
     ]
 
     operations = [