tudor.malene@gmail.com 1e27f0cbe0 Merge remote-tracking branch 'private/master' into feature/tudor_constraints ... # Conflicts: # 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 # node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt		2018-11-14 11:50:19 +00:00
..
src	Merge remote-tracking branch 'private/master' into feature/tudor_constraints	2018-11-14 11:50:19 +00:00
build.gradle	CORDA-2030: Resolve build warnings created by adding kotlin-stdlib-jre8 to node. (#4033)	2018-10-05 11:01:27 +01:00