ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-24 07:06:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
e8b6f5f2f2
corda/client
History
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
..
jackson Merge remote-tracking branch 'private/master' into feature/tudor_constraints 2018-11-14 11:50:19 +00:00
jfx [CORDA-1879]: Ensure Node dies on unrecoverable errors. (#4213) 2018-11-12 15:56:04 +00:00
mock Resolve warnings for Kotlin ByteArray. (#3521) 2018-07-05 13:00:29 +01:00
rpc [CORDA-1879]: Ensure Node dies on unrecoverable errors. (#4213) 2018-11-12 15:56:04 +00:00