projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d9f45bd
2070784
)
Merge branch '4535-configure-api-host-url' closes #4535
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 17 Nov 2014 15:51:17 +0000
(10:51 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 17 Nov 2014 15:51:17 +0000
(10:51 -0500)
1
2
services/api/config/application.default.yml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/config/application.default.yml
Simple merge