Resolve "Eliminate merge conflicts on ChangeLog.md" - Base

Merged Slawek Figiel requested to merge 1120-eliminate-merge-conflicts-on-changelog-md into master

DON'T MERGE BEFORE 1.14!

Closes #1120 (closed)

Edited by Slawek Figiel

Merge request reports