diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-16 11:13:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-16 11:13:31 +0000 |
| commit | ce18246c24040444646884a6a13e472ae83f74ee (patch) | |
| tree | c753ca3a23f6c679ce38992b825c619334afaa49 /doc/user/project/merge_requests/img/merge_conflict_editor.png | |
| parent | bd9e5c9bcce90bd2289ee818bfac58ea3a090aaf (diff) | |
| parent | b8297c122f439e242b8a9790a9b66622709306eb (diff) | |
| download | gitlab-ce-ce18246c24040444646884a6a13e472ae83f74ee.tar.gz | |
Merge branch 'workhorse-6.0.0' into 'master'
Use gitlab-workhorse 6.0.0
See merge request gitlab-org/gitlab-ce!21239
Diffstat (limited to 'doc/user/project/merge_requests/img/merge_conflict_editor.png')
0 files changed, 0 insertions, 0 deletions