Christian Sailer 862b908dd9 Merge branch 'master' of https://github.com/corda/corda into christians_checkpoint_checker_thread ... # Conflicts: # node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt # node/src/test/kotlin/net/corda/node/services/config/FullNodeConfigurationTest.kt		2017-10-27 15:33:00 +01:00
..
capsule	CORDA-736 Add some new features to corda.jar via node.conf for testing (#1926)	2017-10-24 16:49:47 +01:00
src	Merge branch 'master' of https://github.com/corda/corda into christians_checkpoint_checker_thread	2017-10-27 15:33:00 +01:00
build.gradle	CORDA-351: force update dependencies and suppress vulnerabilities not… (#1944)	2017-10-26 12:16:57 +01:00