projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb07b23 da8b740)
Merge remote-tracking branch 'remotes/origin/3504-clients-compatible-with-3036' into...
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:07:40 +0000 (09:07 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 22 Aug 2014 13:07:40 +0000 (09:07 -0400)
Conflicts:
apps/workbench/app/views/projects/_show_contents_rows.html.erb


Trivial merge