# Conflicts:
#	.gitlab-ci.yml
#	app/helpers/groups_helper.rb
#	app/views/layouts/_page.html.haml
#	doc/ci/yaml/README.md
#	doc/topics/autodevops/index.md
#	locale/gitlab.pot

[ci skip]