Skip to content
Snippets Groups Projects
Commit 6c94a442 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'master' into mr-builds 

# Conflicts:
#	app/controllers/projects/merge_requests_controller.rb
#	app/views/projects/merge_requests/widget/_heading.html.haml
parents 5beacba0 e616739e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 143 additions and 46 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment