projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f159fab
c9af3e8
)
Merge branch 'wtsi/13809-root_url-protocol-port-configuration'
author
Peter Amstutz <pamstutz@veritasgenetics.com>
Wed, 5 Sep 2018 18:56:46 +0000
(14:56 -0400)
committer
Peter Amstutz <pamstutz@veritasgenetics.com>
Wed, 5 Sep 2018 18:56:46 +0000
(14:56 -0400)
refs #13809
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@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
projects / arvados.git / commitdiff