tudor.malene@gmail.com
|
7b86c2c3a3
|
Merge remote-tracking branch 'private/master' into tudor_os_merge_23_10
# Conflicts:
# core/src/main/kotlin/net/corda/core/contracts/BelongsToContract.kt
# core/src/main/kotlin/net/corda/core/contracts/TransactionState.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/internal/JarSignatureCollectorTest.kt
# node/src/main/kotlin/net/corda/node/internal/AbstractNode.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/TransactionDSLInterpreter.kt
|
2018-10-23 10:29:43 +01:00 |
|
