# Conflicts:
#	app/models/clusters/platforms/kubernetes.rb
#	app/services/projects/after_rename_service.rb
#	qa/qa/git/repository.rb

[ci skip]