projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
282536b
c8b76b1
)
Merge branch '13561-collection-versions-api'
author
Lucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 11 Oct 2018 18:36:03 +0000
(15:36 -0300)
committer
Lucas Di Pentima <ldipentima@veritasgenetics.com>
Thu, 11 Oct 2018 18:36:03 +0000
(15:36 -0300)
Refs #13561
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
1
2
services/api/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/controllers/application_controller.rb
Simple merge