diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 17:16:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-28 17:16:30 +0000 |
| commit | de87c6f6874c04c9556bd1134079a21a90ad3d2c (patch) | |
| tree | 22c95069b4c1ef65f3235332d6f17169c6ab5c30 /app/controllers/projects/commit_controller.rb | |
| parent | ac3789d29f6eec39ad10c5169af43171b084d00c (diff) | |
| parent | 822534c4c4c05cc53606fc45ca002d4a3d218256 (diff) | |
| download | gitlab-ce-de87c6f6874c04c9556bd1134079a21a90ad3d2c.tar.gz | |
Merge branch '21135-resolve-these-conflicts-link-is-too-subtle' into 'master'
Replace link to Resolve conflicts with buttons
Closes #21135
See merge request !8229
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
0 files changed, 0 insertions, 0 deletions