app/views/projects/refs/logs_tree.js.haml · e4138b346d778d65aa332de4a22e30e9e0d2936f · nexedi / gitlab-ce

Merge remote-tracking branch 'ce/master' into ce-to-ee · e4138b34

Ruben Davila authored Sep 06, 2016

Conflicts:
	Gemfile.lock
	app/views/projects/_merge_request_settings.html.haml
	app/views/projects/tree/_tree_content.html.haml
	doc/user/project/merge_requests.md
	doc/user/project/merge_requests/img/commit_compare.png
	doc/workflow/README.md

e4138b34

logs_tree.js.haml 996 Bytes

Replace logs_tree.js.haml