Merge branch 'release/v0.3.6'

Fantomas42 · Fantomas42 · commit c26ee2369369 · 2015-05-13T15:10:52.000+02:00
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -2,6 +2,11 @@
 Django Tagging Changelog
 ========================
 
+Version 0.3.6, 13th May 2015:
+-----------------------------
+
+* Corrected initial migration
+
 Version 0.3.5, 13th May 2015:
 -----------------------------
 
diff --git a/tagging/__init__.py b/tagging/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (0, 3, 5, "final", 0)
+VERSION = (0, 3, 6, "final", 0)
 
 
 def get_version():
diff --git a/tagging/migrations/0001_initial.py b/tagging/migrations/0001_initial.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
+        ('contenttypes', '0001_initial'),
     ]
 
     operations = [

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`class Migration(migrations.Migration):`
`7`	`7`
`8`	`8`	`dependencies = [`
`9`		`- ('contenttypes', '0002_remove_content_type_name'),`
	`9`	`+ ('contenttypes', '0001_initial'),`
`10`	`10`	`]`
`11`	`11`
`12`	`12`	`operations = [`