Merge branch 'release/1.2.0' into develop

FutureProofGames · Jan 13, 2020 · 944f587 · 944f587
2 parents a500ccb + caf65dd
commit 944f587
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -68,6 +68,14 @@ rewrite ^/?presskit/sheet\.php$           /presskit/ permanent
 ```
 If you're using nginx and one of your slugs has more than ten underscores, add a rewrite above the first one to manually fix that one case. Nginx does not want to loop more than 10 times in a rewrite calculation.
 
+## Changelog
+
+### 1.2.0
+
+* Upgrade to support Python 3.6+
+* Bump to Pillow 6.2.0
+* Bump to Django 1.11.23
+
 ## Contributing
 
 When submitting issues or pull requests, please adhere to our [Code of Conduct](CODE_OF_CONDUCT.md).
diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django_presskit",
-    version="1.1.2",
+    version="1.2.0",
     author="Future Proof Games",
     author_email="info@futureproofgames.com",
     description="A port of presskit() to Django",