Merge branch 'master' into develop

bigjason · Jan 24, 2019 · 7cb6c0e · 7cb6c0e
2 parents 662b1b2 + 9632a53
commit 7cb6c0e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Changelog.rst b/Changelog.rst
@@ -9,6 +9,7 @@ Changelog
 * ``DjangoChoices`` subclasses are now directly iterable (yielding the choice
   tuples) (@brianjbuck in #53)
 * documentation of ``DjangoChoices.labels`` is fixed (#54)
+* typo fixed in docs (@nielznl in #57)
 
 1.6.0
 -----