app/views/projects · 6e550af150958d0c88bf21f206c2309dc0b5c78d · Forest Godfrey / gitlab-ce

Merge branch 'master' into 6-0-dev · f438bd41

authored Jun 30, 2013

Conflicts:
	app/controllers/admin/teams/projects_controller.rb
	app/views/team_members/_team_member.html.haml
	app/views/teams/members/_member.html.haml

f438bd41

Name	Last commit	Last update
..
blame		Loading commit data...
blob		Loading commit data...
commit		Loading commit data...
commits		Loading commit data...
compare		Loading commit data...
deploy_keys		Loading commit data...
edit_tree		Loading commit data...
graphs		Loading commit data...
hooks		Loading commit data...
issues		Loading commit data...
labels		Loading commit data...
merge_requests		Loading commit data...
milestones		Loading commit data...
network		Loading commit data...
notes		Loading commit data...
protected_branches		Loading commit data...
refs		Loading commit data...
repositories		Loading commit data...
services		Loading commit data...
snippets		Loading commit data...
team_members		Loading commit data...
tree		Loading commit data...
walls		Loading commit data...
wikis		Loading commit data...
_clone_panel.html.haml		Loading commit data...
_errors.html.haml		Loading commit data...
_settings_nav.html.haml		Loading commit data...
create.js.haml		Loading commit data...
edit.html.haml		Loading commit data...
empty.html.haml		Loading commit data...
fork.html.haml		Loading commit data...
new.html.haml		Loading commit data...
show.html.haml		Loading commit data...
show.js.haml		Loading commit data...
transfer.js.haml		Loading commit data...
update.js.haml		Loading commit data...