summaryrefslogtreecommitdiff
path: root/doc/gitlab-basics/add-merge-request.md
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-06 10:11:24 +0200
committerRémy Coutable <remy@rymai.me>2016-10-06 10:11:24 +0200
commitf90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4 (patch)
tree42761eaa48b4c80ef6fce0d409eaee803dfc8ad0 /doc/gitlab-basics/add-merge-request.md
parent66a9511b5245d3bd701b7246b4dafe4851159733 (diff)
downloadgitlab-ce-f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4.tar.gz
Fix CHANGELOG and wrong conflict resolution
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc/gitlab-basics/add-merge-request.md')
0 files changed, 0 insertions, 0 deletions