Skip to content
Commit 08994f3f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge remote-tracking branch 'origin/merge_button'

Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
parents 9af14e4b 3a6694b5
Loading
Loading
Loading