summaryrefslogtreecommitdiff
path: root/shared
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-08-17 15:34:53 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-08-17 15:34:53 +0300
commit2257fda38e37f5aa59a9ef83c6c6cff36bbcb182 (patch)
tree624404fdf2de53dc00d94cc219de36bbb0543c85 /shared
parent7cb76ce1c65e9f0b307cc092a1140a744eaa8277 (diff)
downloadgitlab-ce-2257fda38e37f5aa59a9ef83c6c6cff36bbcb182.tar.gz
Reference the version 'UI resolve conflicts' was introduced
[ci skip]
Diffstat (limited to 'shared')
0 files changed, 0 insertions, 0 deletions