projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ef6488 403d9f6)
Merge branch 'master' into 3338-tab-counts
authorPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 18:32:04 +0000 (14:32 -0400)
committerPhil Hodgson <bitbucket@philhodgson.net>
Thu, 18 Sep 2014 18:32:04 +0000 (14:32 -0400)
1  2 
apps/workbench/config/routes.rb patch | diff1 | diff2 | blob | history
apps/workbench/test/integration/projects_test.rb patch | diff1 | diff2 | blob | history

diff --cc apps/workbench/config/routes.rb
Simple merge