diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-26 02:32:39 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-26 02:32:39 +0100 |
| commit | d61b4058efb53d52bcd2f21e012d524b76ba3d9d (patch) | |
| tree | 09cf20bab9f9b68ea0beea29b55090d008d8fecd /.gitattributes | |
| parent | 6f16726ce63949191096fcf89bb2bf99647dc096 (diff) | |
| download | gitlab-ce-api-js-es6.tar.gz | |
Review changesapi-js-es6
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 7e800609e6c..17cbaa5eef5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -CHANGELOG merge=union
\ No newline at end of file +CHANGELOG merge=union +*.js.es6 gitlab-language=javascript |