# Conflicts:
#	app/controllers/confirmations_controller.rb
#	app/controllers/registrations_controller.rb
#	scripts/utils.sh

[ci skip]