| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'es6-gitlab-sytanx-highlighting' into 'master' | Douwe Maan | 2016-07-27 | 1 | -1/+2 |
| * | Use gitattribute merge=union to reduce CHANGELOG merge conflicts. | Douwe Maan | 2015-02-12 | 1 | -0/+1 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |
path: root/.gitattributes