Skip to content
GitLab

CE upstream

Merged Valery Sizov requested to merge ce_upstream into master

@dzaporozhets Please resolve these conflicts

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/groups/group_members/index.html.haml
	both modified:   app/views/projects/project_members/index.html.haml