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
..
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	Corrected isolated.jar excludes for all projects and corrected some test dependencies.	2017-09-22 18:19:07 +02:00