delta/gitlab/gitlab-ce.git/.gitattributes, branch scroll-code-blocks gitlab.com: gitlab-org/gitlab-ce.git Added '*.js.es6 gitlab-language=javascript' to .gitattributes 2016-07-25T23:55:00+00:00 Luke Bennett lukeeeebennettplus@gmail.com 2016-07-25T23:55:00+00:00 c36d1b162c2a02ae61a4b7b62b6e96df6cb7e9e0 






Use gitattribute merge=union to reduce CHANGELOG merge conflicts.
2015-02-12T19:50:09+00:00

Douwe Maan
douwe@gitlab.com

2015-02-12T19:34:34+00:00

4377ba1c360cf6f4d15e3b5ad2a7ed7bc41f795e