tudor.malene@gmail.com 29a8c153ed Merge branch 'master' into tudor_merge_os_24_10 ... # Conflicts: # core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt # core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt # core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt # core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt # core/src/test/kotlin/net/corda/core/contracts/PackageOwnershipVerificationTests.kt # core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt # node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt # node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt # testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TestDSL.kt # testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt # testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt		2018-10-24 17:09:30 +01:00
..
integration-test/kotlin/net/corda/finance/compat	CORDA-1621: The finance CorDapp uses the app config feature rather than the node's config (#4100)	2018-10-22 18:56:30 +01:00
main	Merge branch 'master' into tudor_merge_os_24_10	2018-10-24 17:09:30 +01:00
test	Merge branch 'master' into tudor_merge_os_24_10	2018-10-24 17:09:30 +01:00