diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 12:10:09 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 12:10:09 -0600 |
| commit | d8654744cd6c8fa4cbe4617c2428cd79d4bd5179 (patch) | |
| tree | 159d92727944184792c939210b5b73aaf348336a /doc/user/project/merge_requests/img | |
| parent | 4a13aa9f34ab4114bc485e1ca8fa0db8daa0394b (diff) | |
| parent | 46dc00631aeae34c1964888625c5ccd04da6b4c1 (diff) | |
| download | gitlab-ce-d8654744cd6c8fa4cbe4617c2428cd79d4bd5179.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'doc/user/project/merge_requests/img')
| -rw-r--r-- | doc/user/project/merge_requests/img/conflict_section.png | bin | 0 -> 247537 bytes |
| -rw-r--r-- | doc/user/project/merge_requests/img/merge_request_widget.png | bin | 0 -> 32292 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/conflict_section.png b/doc/user/project/merge_requests/img/conflict_section.png Binary files differnew file mode 100644 index 00000000000..842e50b14b2 --- /dev/null +++ b/doc/user/project/merge_requests/img/conflict_section.png diff --git a/doc/user/project/merge_requests/img/merge_request_widget.png b/doc/user/project/merge_requests/img/merge_request_widget.png Binary files differnew file mode 100644 index 00000000000..ffb96b17b07 --- /dev/null +++ b/doc/user/project/merge_requests/img/merge_request_widget.png |
