josecoll 7a9364c8d5 Merge remote-tracking branch 'open/master' into colljos-merge-171117 ... # Conflicts: # .idea/compiler.xml # build.gradle # client/rpc/src/integration-test/kotlin/net/corda/client/rpc/CordaRPCClientTest.kt # docs/source/changelog.rst # node/src/integration-test/kotlin/net/corda/node/services/AttachmentLoadingTests.kt # node/src/main/kotlin/net/corda/node/internal/StartedNode.kt # node/src/main/kotlin/net/corda/node/utilities/registration/HTTPNetworkRegistrationService.kt # samples/network-visualiser/build.gradle # samples/simm-valuation-demo/src/integration-test/kotlin/net/corda/vega/SimmValuationTest.kt # testing/node-driver/src/integration-test/kotlin/net/corda/testing/driver/DriverTests.kt # testing/node-driver/src/main/kotlin/net/corda/testing/driver/Driver.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockNode.kt		2017-11-17 15:11:24 +00:00
..
source	Merge remote-tracking branch 'open/master' into colljos-merge-171117	2017-11-17 15:11:24 +00:00
build.gradle	Merge Open Source to Enterprise (#79)	2017-10-25 13:54:34 +01:00
index.html	Added a convenience HTML file for redirecting to the main docs.	2016-11-22 11:56:46 +00:00
install-docsite-requirements.sh	Make virtualenv installable if the checkout path has whitespace. (#1187)	2017-08-18 13:31:00 +01:00
make-docsite.sh	Fix RPC documentation	2017-05-11 17:44:45 +01:00
Makefile	Introduce documentation of the current prototype with a contract programming tutorial (incomplete), using the Sphinx docs engine.	2015-11-25 18:01:37 +01:00
packages.md	Docs: more package descriptions and take non-stabilised APIs out of the docs build. (#1774)	2017-10-03 11:57:12 +01:00
requirements.txt	docs: Add build_docs.sh	2016-07-11 12:17:18 +01:00