# Conflicts:
#	.flayignore
#	app/controllers/projects/issues_controller.rb
#	app/controllers/projects/merge_requests_controller.rb
#	app/models/namespace.rb
#	app/models/wiki_page.rb
#	config/routes/group.rb
#	db/schema.rb
#	doc/administration/auth/ldap.md
#	doc/user/group/index.md
#	locale/gitlab.pot
#	spec/factories/uploads.rb
#	spec/models/namespace_spec.rb
#	spec/uploaders/file_uploader_spec.rb

[ci skip]