# Conflicts:
#	GITALY_SERVER_VERSION
#	app/views/layouts/nav/_new_group_sidebar.html.haml
#	lib/gitlab/git/branch.rb
#	lib/gitlab/git/repository.rb
#	lib/gitlab/gitaly_client/ref_service.rb
#	spec/features/boards/boards_spec.rb
#	spec/lib/gitlab/gitaly_client/commit_service_spec.rb
#	spec/services/git_push_service_spec.rb
[ci skip]