summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 18:25:05 +0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-09-05 18:25:05 +0200
commitbf00e0f4b2fd8994df8f7b567839f12715a05fde (patch)
tree8747b81c85793cf980d08e2d1b15389e964dd4f8 /doc/user/project/merge_requests
parent99f28c50d5483d6f55e7accaf1806e68acc46568 (diff)
downloadgitlab-ce-bf00e0f4b2fd8994df8f7b567839f12715a05fde.tar.gz
Add links to new docs in merge_requests.md and workflow/README.md
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff.pngbin103239 -> 69394 bytes
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.pngbin71896 -> 0 bytes
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/merge_request_diff.png b/doc/user/project/merge_requests/img/merge_request_diff.png
index 3ebbfb75ea3..06ee4908edc 100644
--- a/doc/user/project/merge_requests/img/merge_request_diff.png
+++ b/doc/user/project/merge_requests/img/merge_request_diff.png
Binary files differ
diff --git a/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png b/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png
deleted file mode 100644
index a0db535019c..00000000000
--- a/doc/user/project/merge_requests/img/merge_request_diff_without_whitespace.png
+++ /dev/null
Binary files differ