Changelog for PR #58

82b3c0f6 · Julien Muchembled · f726e40a · 82b3c0f6
Commit 82b3c0f6 authored May 09, 2016 by Julien Muchembled
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

CHANGES.rst CHANGES.rst +3 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -26,6 +26,9 @@
  transaction.
  https://github.com/zopefoundation/ZODB/pull/52
+- DemoStorage: add support for conflict resolution and fix history()
+  https://github.com/zopefoundation/ZODB/pull/58
 4.2.0 (2015-06-02)
 ==================