Skip to content
Snippets Groups Projects
Commit 20e269cb authored by Marco Wessel's avatar Marco Wessel
Browse files

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into configure-protection 

Conflicts:
	CHANGELOG
	db/schema.rb
parents 2a450211 604f3927
Branches
Tags
1 merge request!314Allow configuring protection of default branch upon first push
Show whitespace changes
Inline Side-by-side
Showing
with 235 additions and 34 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment