OSDN Git Service

Merge branch 'master' into 6-0-dev
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 30 Jun 2013 08:35:40 +0000 (11:35 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sun, 30 Jun 2013 08:35:40 +0000 (11:35 +0300)
commitf438bd415ffc4405c2e81360a92ffaf907cd87ad
tree6543a5114236effcba0dc3f4ac307b7d33d65cc3
parent0904cc485c23385e4ac0628ddce5e1c842909af4
parentd9c02f30e56592986b98bcbf8e7c1abd712b696f
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
app/helpers/projects_helper.rb
app/views/profiles/show.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/repositories/_branch.html.haml
app/views/projects/repositories/_feed.html.haml
app/views/projects/repositories/stats.html.haml
app/views/users/show.html.haml
spec/routing/project_routing_spec.rb