diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-28 19:11:01 +0000 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-11-28 19:11:01 +0000 |
commit | 88254cd360f61103a62937df06fc40d0011222e2 (patch) | |
tree | f194b143535d306e9a0907b0bf27d77fa192020b /app/views/groups/labels/new.html.haml | |
parent | 62488fe2fc035aa62520de45b8cac1b5a4113f43 (diff) | |
parent | 1b7ecba0c4fc0a6d2de402ce9e3ea4c67411a57c (diff) | |
download | gitlab-ce-88254cd360f61103a62937df06fc40d0011222e2.tar.gz |
Merge branch 'jramsay/improve-resolve-conflicts-docs' into 'master'
Improve detail of resolve conflict docs
See merge request gitlab-org/gitlab-ce!22927
Diffstat (limited to 'app/views/groups/labels/new.html.haml')
0 files changed, 0 insertions, 0 deletions