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
..
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 features/ENT-1153/merge_OS2ENT	2017-11-27 16:52:29 +00:00