app/views/projects/team_members/_team_member.html.haml · 976e18bb33bd95645367131bec2d8ac8205c9832 · nexedi / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre · 976e18bb
Dmitriy Zaporozhets authored Feb 23, 2015
```
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
```
976e18bb

_team_member.html.haml 931 Bytes