# Conflicts:
#	app/assets/javascripts/dispatcher.js
#	app/assets/javascripts/main.js
#	app/assets/stylesheets/framework.scss
#	app/controllers/application_controller.rb
#	app/helpers/projects_helper.rb
#	app/models/note.rb
#	app/models/protected_branch.rb
#	app/services/ci/register_job_service.rb
#	app/services/users/build_service.rb
#	app/views/admin/health_check/show.html.haml
#	app/views/ci/variables/_variable_row.html.haml
#	app/views/help/index.html.haml
#	app/views/layouts/devise.html.haml
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	lib/api/helpers/runner.rb
#	lib/gitlab/auth.rb
#	spec/lib/gitlab/current_settings_spec.rb
#	spec/lib/gitlab/usage_data_spec.rb

[ci skip]