rick.parker 237c133804 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180814-1 ...

# Conflicts:
#	CONTRIBUTORS.md
#	constants.properties
#	docs/source/index.rst
#	docs/source/upgrading-cordapps.rst
#	node/build.gradle

2018-08-14 11:26:52 +01:00

..

isolated

Introduced copyright in all source files. (#519)

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

src

Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180814-1

2018-08-14 11:26:52 +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