Merge remote-tracking branch 'awesto/master' into releases/0.12.x

# Conflicts: # docs/changelog.rst # example/docker-files/Dockerfile # shop/__init__.py # shop/templates/shop/checkout/payment-method-form.html
songzxDev · Feb 21, 2018 · 2b528b1 · 2b528b1
2 parents 82558f8 + b149348
commit 2b528b1
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -70,6 +70,13 @@ Changelog for django-SHOP
 * Remove ``angular-message`` from the list of npm dependencies.
 
 
+0.11.7
+======
+
+* Fix: Python3 can not handle ``None`` type in max() function.
+* Smoother animation when showing Payment form.
+
+
 0.11.6
 ======