NEWS: mention recent conflicts bugfix.
This commit is contained in:
1 parent
182e5bb421
commit
62f76e5497
1 file changed
+3
Reference in new issue
Block a user