# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock
#	scripts/lint-rugged
#	spec/models/namespace_spec.rb

[ci skip]