Commit graph

1 commit

Author SHA1 Message Date
Douwe Maan
4377ba1c36 Use gitattribute merge=union to reduce CHANGELOG merge conflicts. 2015-02-12 20:50:09 +01:00