# Conflicts:
#	GITALY_SERVER_VERSION
#	app/assets/javascripts/boards/components/issue_card_inner.vue
#	spec/features/protected_branches_spec.rb

[ci skip]