# Conflicts:
#	app/assets/javascripts/environments/components/environments_table.vue
#	app/assets/javascripts/notes/components/note_actions.vue
#	lib/api/triggers.rb

[ci skip]