# Conflicts:
#	db/schema.rb
#	doc/README.md
#	doc/ci/examples/README.md
#	doc/user/project/merge_requests/index.md
#	locale/gitlab.pot

[ci skip]