diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-03 08:39:16 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-01-03 08:39:16 +0000 |
| commit | 57906a532227c86acac0e9da0ae918967b592f06 (patch) | |
| tree | 2bfc7720c0b38fa21aea0f58a2f5aa3a055398b1 /lib/api/helpers.rb | |
| parent | 305038e53aa4366ac6a27013787ec0e51d1f3b67 (diff) | |
| parent | 65e3a1e9e9a316a2bbbcd49e22b858b8b1bd9890 (diff) | |
| download | gitlab-ce-57906a532227c86acac0e9da0ae918967b592f06.tar.gz | |
Merge branch 'gitaly-conflict-resolver' into 'master'
Gitaly conflict resolver
Closes gitaly#813
See merge request gitlab-org/gitlab-ce!15755
Diffstat (limited to 'lib/api/helpers.rb')
0 files changed, 0 insertions, 0 deletions