Dmitriy Zaporozhets f438bd415f Merge branch 'master' into 6-0-dev ... Conflicts: app/controllers/admin/teams/projects_controller.rb app/views/team_members/_team_member.html.haml app/views/teams/members/_member.html.haml		2013-06-30 11:35:40 +03:00
..
_profile.html.haml	Remove team_member show page -> use user_path instead	2013-03-13 19:16:36 +02:00
_projects.html.haml	Remove invalid information from /u/:user page	2013-06-21 16:16:05 +03:00
show.html.haml	Merge branch 'master' into 6-0-dev	2013-06-30 11:35:40 +03:00