Matthew Nesbit 2653da9f12 Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307 ... # Conflicts: # node/src/main/kotlin/net/corda/node/services/messaging/Messaging.kt # node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt # node/src/main/kotlin/net/corda/node/services/statemachine/StateMachineManagerImpl.kt		2018-03-07 11:02:32 +00:00
..
src	Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180307	2018-03-07 11:02:32 +00:00
build.gradle	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00