# Conflicts:
#	db/schema.rb
#	doc/administration/index.md
#	doc/user/admin_area/settings/email.md
#	spec/mailers/previews/notify_preview.rb

[ci skip]