diff --git a/AUTHORS.rst b/AUTHORS.rst index 2a26eeb..c4a9367 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,3 +1,4 @@ +ad-m Alejandro Varas Alex Orange Andy Freeland diff --git a/CHANGES.rst b/CHANGES.rst index efdde71..b0f75bd 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,9 @@ master (unreleased) instances of a model from the same queryset. Thanks Bram Boogaard. Merge of GH-151. +* Fix Django 1.7 migrations compatibility for SplitField. Thanks ad-m. Merge of + GH-157; fixes GH-156. + 2.2 (2014.07.31) ----------------