projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc51a3a
340bd4f
)
Merge branch '2376-show-collection-tags-everywhere'
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Apr 2014 18:11:44 +0000
(14:11 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 16 Apr 2014 18:11:44 +0000
(14:11 -0400)
Conflicts:
apps/workbench/app/controllers/actions_controller.rb
1
2
apps/workbench/app/controllers/collections_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/collections_controller.rb
Simple merge
projects / arvados.git / commitdiff