Achilleas Pipinellis b72f43d053 Add docs for resolve conflicts editor ... [ci skip]		2017-01-24 17:23:47 +01:00
..
img	Add docs for resolve conflicts editor	2017-01-24 17:23:47 +01:00
authorization_for_merge_requests.md	Refactor authorization_for_merge_requests.md	2016-09-05 19:32:37 +02:00
cherry_pick_changes.md	Move cherry_pick_changes.md to new location	2016-09-05 13:40:41 +02:00
merge_request_discussion_resolution.md	Add images to issue creation from unresolved discussions	2016-12-22 23:54:08 +02:00
merge_when_build_succeeds.md	Move MWPS document to new location	2016-11-29 11:35:30 +01:00
merge_when_pipeline_succeeds.md	Move MWPS document to new location	2016-11-29 11:35:30 +01:00
resolve_conflicts.md	Add docs for resolve conflicts editor	2017-01-24 17:23:47 +01:00
revert_changes.md	Move revert_changes.md to new location	2016-09-05 13:46:37 +02:00
versions.md	Refactor merge requests revisions	2016-10-14 10:25:11 +02:00
work_in_progress_merge_requests.md	Move `wip_merge_requests.md` to a new location	2016-09-05 13:33:45 +02:00