LankyDan 4ccd0fd3df Merge branch 'release/os/4.6' into dan/4.6-into-checkpoint-feature-branch-2020-05-05 ... # Conflicts: # node/src/main/kotlin/net/corda/node/services/statemachine/Event.kt # node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt # node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt # node/src/main/kotlin/net/corda/node/services/statemachine/transitions/TopLevelTransition.kt		2020-05-05 17:05:23 +01:00
..
src	Merge branch 'release/os/4.6' into dan/4.6-into-checkpoint-feature-branch-2020-05-05	2020-05-05 17:05:23 +01:00
build.gradle	CORDA-3698: Require no classifier for Open Core and DJVM-related modules. (#6132)	2020-04-06 11:00:40 +01:00