Shams Asari 98cd8be160 Merge remote-tracking branch 'open/master' into os-merge-b97af47 ...

# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	docs/source/release-notes.rst
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
#	tools/bootstrapper/build.gradle

2018-06-25 11:38:30 +01:00

..

src

Merge remote-tracking branch 'open/master' into os-merge-b97af47

2018-06-25 11:38:30 +01:00

build.gradle

CORDA-1511: Kryo only used for node checkpoints and so moved out of serialization module and into node (#3228)

2018-05-24 12:18:07 +01:00