# Conflicts:
#	app/views/groups/labels/index.html.haml
#	config/initializers/1_settings.rb
#	doc/update/README.md

[ci skip]