# Conflicts:
#	CHANGELOG.md
#	app/assets/javascripts/dispatcher.js
#	doc/user/project/clusters/index.md

[ci skip]