projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ee435c5
0858763
)
Merge remote-tracking branch 'origin/master' into 2884-improved-picker
author
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:32:13 +0000
(16:32 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Jun 2014 20:32:13 +0000
(16:32 -0400)
1
2
apps/workbench/app/assets/stylesheets/application.css.scss
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/controllers/collections_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/assets/stylesheets/application.css.scss
Simple merge
diff --cc
apps/workbench/app/controllers/collections_controller.rb
Simple merge
projects / arvados.git / commitdiff