Commit 7d436f39 authored by Julien Muchembled's avatar Julien Muchembled

Changelog for PR #98

parent b74eef76
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
Change History Change History
================ ================
4.4.4 (unreleased)
==================
- Call _p_resolveConflict() even if a conflicting change doesn't change the
state. This reverts to the behaviour of 3.10.3 and older.
4.4.3 (2016-08-04) 4.4.3 (2016-08-04)
================== ==================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment