# Conflicts:
#	app/controllers/profiles_controller.rb
#	app/controllers/projects/issues_controller.rb
#	app/views/projects/issues/_nav_btns.html.haml
#	app/views/shared/issuable/form/_merge_params.html.haml
#	config/routes/project.rb
#	db/schema.rb
#	locale/gitlab.pot
#	spec/controllers/application_controller_spec.rb

[ci skip]