Andrzej Cichocki bd342a690c

Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges ...

# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/CordaPersistence.kt
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/DatabaseTransaction.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt

2018-01-19 13:46:27 +00:00

..

capsule

Merge from R3 Corda 3.0 Dev Preview release branch to master

2018-01-13 11:00:01 +00:00

src

Merge commit 'bbcafca959b2d468a6f4f9bb847a1bbb7bfc9fdc' into andr3ej-os-merges

2018-01-19 13:46:27 +00:00

build.gradle

Fixing stuff

2017-12-18 15:39:08 +00:00