projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f3de04
ac5a69c
)
Merge branch '2049-run-job-from-workbench' into 1971-show-image-thumbnails
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Mar 2014 13:43:55 +0000
(08:43 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 3 Mar 2014 13:43:55 +0000
(08:43 -0500)
1
2
apps/workbench/app/assets/stylesheets/application.css.scss
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/collections/_show_files.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge
diff --cc
apps/workbench/app/views/collections/_show_files.html.erb
Simple merge
projects / arvados.git / commitdiff