Stefano Franz 480698bc46 Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27 ...

# Conflicts:
#	CONTRIBUTORS.md

2018-07-11 11:37:49 +01:00

..

src/main/kotlin/net/corda/deterministic/common

fix for spring boot rpc and it work with deterministic serialization

2018-07-11 10:59:21 +01:00

build.gradle

Merge remote-tracking branch 'open/master' into os-merge-2018-06-18-17_42

2018-06-18 17:51:41 +01:00