Shams Asari 03fae9bd7d Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b ...

# Conflicts:
#	.idea/compiler.xml
#	node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
#	node/src/main/kotlin/net/corda/node/services/statemachine/transitions/StateMachine.kt

2018-05-30 21:47:48 +01:00

..

isolated

Introduced copyright in all source files. (#519)

2018-03-06 17:29:21 +00:00

src

Merge branch 'merge-5d1cc0b' into os-merge-5d1cc0b

2018-05-30 21:47:48 +01:00

build.gradle

Merge remote-tracking branch 'remotes/open/master' into merges/may-21-17-24

2018-05-21 17:29:26 +01:00