# Conflicts:
#	app/models/user.rb
#	doc/administration/job_artifacts.md
#	doc/ci/variables/README.md
#	doc/user/project/integrations/bamboo.md
#	doc/user/project/issues/index.md
#	doc/user/project/merge_requests/index.md
#	doc/user/project/repository/index.md
#	doc/user/project/settings/index.md

[ci skip]