2 commits

Author	SHA1	Message	Date
Hylke Bons	8c8a5a460e	git repo: Keep original plus both diverging versions on conflicts. Closes #1716	2017-12-16 17:56:13 +01:00
Hylke Bons	4970646f4b	Rename News.txt to release-notes.txt	2017-09-21 10:16:30 +01:00

Renamed from News.txt (Browse further)