# Conflicts:
#	app/controllers/passwords_controller.rb
#	app/finders/users_finder.rb
#	app/models/hooks/service_hook.rb
#	app/models/issue.rb
#	app/models/note.rb
#	app/models/user.rb
#	app/services/applications/create_service.rb
#	app/services/milestones/update_service.rb
#	app/services/search/group_service.rb
#	lib/api/helpers.rb
#	lib/api/resource_label_events.rb
#	lib/gitlab/group_hierarchy.rb

[ci skip]