projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9f88440
a53d5ec
)
Merge branch '6941-docs-fix-www-data' closes #6941
author
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 24 Aug 2015 14:03:56 +0000
(10:03 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Mon, 24 Aug 2015 14:03:56 +0000
(10:03 -0400)
1
2
doc/install/install-api-server.html.textile.liquid
patch
|
diff1
|
diff2
|
blob
|
history
doc/install/install-arv-git-httpd.html.textile.liquid
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
doc/install/install-api-server.html.textile.liquid
Simple merge
diff --cc
doc/install/install-arv-git-httpd.html.textile.liquid
Simple merge