Merge branch 'release/6.10.0' into develop

praekeltfoundation · Aug 21, 2018 · b54321c · b54321c
2 parents 6a3d126 + 5720e8d
commit b54321c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,11 @@
 CHANGE LOG
 ==========
 
+6.10.0
+------
+- Add the missing Migration
+- Fix the typo in the models help_text causing "TypeError: ugettext()"
+
 6.9.10
 ------
 - Add error validation for choice fields

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.9.10
+6.10.0