# Conflicts:
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	app/assets/javascripts/boards/components/issue_time_estimate.vue
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/jobs/components/job_app.vue
#	app/assets/stylesheets/pages/boards.scss
#	app/controllers/boards/issues_controller.rb
#	app/controllers/projects/autocomplete_sources_controller.rb
#	app/views/admin/application_settings/_email.html.haml
#	db/schema.rb
#	doc/ci/variables/README.md
#	doc/ci/yaml/README.md
#	doc/install/README.md
#	doc/user/admin_area/settings/email.md
#	lib/gitlab/ci/config/entry/job.rb
#	lib/gitlab/ci/config/normalizer.rb
#	locale/gitlab.pot
#	spec/finders/snippets_finder_spec.rb
#	spec/lib/gitlab/ci/config/normalizer_spec.rb
#	spec/models/user_spec.rb
#	spec/support/helpers/migrations_helpers.rb
#	spec/support/helpers/test_env.rb

[ci skip]