Viktor Kolomeyko 355c65ad62 Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/os-merge ...

# Conflicts:
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/SharedContexts.kt
#	node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/SearchField.kt
#	tools/explorer/src/main/kotlin/net/corda/explorer/views/TransactionViewer.kt

2018-05-10 15:36:07 +01:00

..

src

Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/os-merge

2018-05-10 15:36:07 +01:00

build.gradle

Merge commit '5f70b6e04954a6dc64a1a56089eeccb2966bb0ae' into chrisr3-os-merge

2018-04-24 18:09:41 +01:00