# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	app/assets/javascripts/environments/components/environment_item.vue

[ci skip]