# Conflicts:
#	app/assets/javascripts/main.js
#	app/assets/javascripts/monitoring/components/dashboard.vue
#	app/assets/javascripts/notes/components/note_header.vue
#	app/assets/javascripts/user_popovers.js
#	app/assets/javascripts/vue_shared/components/user_popover/user_popover.vue
#	app/controllers/projects/environments_controller.rb
#	locale/gitlab.pot
#	spec/javascripts/api_spec.js
#	spec/javascripts/user_popovers_spec.js

[ci skip]