Files
gitlabhq/db/migrate
Jacob Vosmaer 90ce0be420 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee into feature-120-multiple-ldap-groups
Conflicts:
	app/models/group.rb
	app/views/groups/members.html.haml
	db/schema.rb
2014-08-29 14:43:20 +02:00
..