Tudor Malene e8d833c2fe Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT ... # Conflicts: # .idea/compiler.xml # docs/source/changelog.rst # node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt # testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt # testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt		2017-11-27 16:52:29 +00:00
..
src	Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT	2017-11-27 16:52:29 +00:00
build.gradle	Corrected isolated.jar excludes for all projects and corrected some test dependencies.	2017-09-22 18:19:07 +02:00