# Conflicts:
#	app/views/projects/project_members/index.html.haml
#	config/routes/api.rb
#	doc/api/namespaces.md
#	doc/api/protected_branches.md
#	doc/ci/variables/README.md
#	doc/system_hooks/system_hooks.md
#	doc/user/project/protected_branches.md
#	lib/api/protected_branches.rb
#	locale/gitlab.pot

[ci skip]