# Conflicts:
#	app/models/ci/runner.rb
#	app/models/project_authorization.rb
#	app/models/user.rb

[ci skip]