2 commits

Author	SHA1	Message	Date
Luke Bennett	c36d1b162c	Added '*.js.es6 gitlab-language=javascript' to .gitattributes	2016-07-26 00:55:00 +01:00
Douwe Maan	4377ba1c36	Use gitattribute merge=union to reduce CHANGELOG merge conflicts.	2015-02-12 20:50:09 +01:00