josecoll 86cc21a473 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:48 +00:00
..
runConfigurations	Merge remote-tracking branch 'open/master' into colljos-merge-171117	2017-11-17 15:11:24 +00:00
scopes	Add an IntelliJ scope that covers the currently supported Corda API.	2017-09-27 11:47:34 +02:00
codeStyleSettings.xml	Initial stub for IntelliJ Code Style settings (#1832)	2017-10-09 13:24:17 +01:00
compiler.xml	Merge remote-tracking branch 'open/master' into colljos-merge-171117	2017-11-17 15:11:48 +00:00