# Conflicts:
#	CHANGELOG.md
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	locale/gitlab.pot
#	spec/controllers/oauth/applications_controller_spec.rb

[ci skip]