summaryrefslogtreecommitdiff
path: root/.gitattributes
Commit message (Expand)AuthorAgeFilesLines
* Added '*.js.es6 gitlab-language=javascript' to .gitattributesLuke Bennett2016-07-261-1/+2
* Use gitattribute merge=union to reduce CHANGELOG merge conflicts.Douwe Maan2015-02-121-0/+1