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

..

common

Merge remote-tracking branch 'open/master' into my-merge-july-11-11-27

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

data

Merge from O/S

2018-07-05 19:09:25 +01:00

src/test

CORDA-1699: Restore binary compatibility for UniqueIdentifier class. (#3505)

2018-07-05 16:14:56 +01:00

build.gradle

Merge from O/S

2018-07-05 19:09:25 +01:00