# Conflicts:
#	.gitlab-ci.yml
#	app/assets/javascripts/boards/services/board_service.js
#	app/helpers/services_helper.rb

[ci skip]