Merge branch 'master' into develop

romgar · Apr 11, 2020 · 75dcb45 · 75dcb45
2 parents 0fc0b63 + 3887dee
commit 75dcb45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/ChangeLog.rst b/ChangeLog.rst
@@ -3,21 +3,30 @@ ChangeLog
 
 .. _master:
 
-master (unreleased)
--------------------
+master
+------
+
+Up-to-date with 1.4 release.
+
+.. _v1.4:
+
+1.4 (11/04/2020)
+----------------
 
 *New:*
     - Drop support of Python 3.4
-    - Confirm support of Python 3.7
     - Drop support of Django 1.8
     - Drop support of Django 1.9
     - Drop support of Django 1.10
+    - Confirm support of Python 3.7
     - Confirm support of Django 2.0
     - Confirm support of Django 2.1
     - Confirm support of Django 2.2
 
 *Bugfix:*
-    - Fix tests for Django 2.0
+    - Fixes tests for Django 2.0
+    - :code:`refresh_from_db` is now properly resetting dirty fields.
+    - Adds :code:`normalise_function` to provide control on how dirty values are stored
 
 .. _v1.3.1:
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@ def listify(filename):
 
 setup(
     name="django-dirtyfields",
-    version="1.3.1",
+    version="1.4",
     url='http://github.com/romgar/django-dirtyfields',
     license='BSD',
     description=("Tracking dirty fields on a Django model instance "