Shams Asari 6f79e60a9d Merge branch 'merge-point-c419605' into shams-os-merge-231118 ...

# Conflicts:
#	CONTRIBUTING.md
#	build.gradle
#	docs/source/api-scanner.rst
#	docs/source/building-corda.rst
#	docs/source/contributing-index.rst
#	docs/source/contributing.rst
#	docs/source/testing.rst
#	node/capsule/build.gradle
#	node/src/main/kotlin/net/corda/node/services/schema/NodeSchemaService.kt
#	node/src/main/resources/migration/vault-schema.changelog-master.xml

2018-11-23 16:34:49 +00:00

..

capsule

[CORDA-2249]: Specified unique applicationId in Capsule manifest. (#1585)

2018-11-22 13:53:29 +00:00

dist

really disable building installer dist on OS X (#1547)

2018-11-07 18:16:51 +00:00

lib

[ENT-2539] Implement support for holding node Legal Identity keys in Ultimaco HSM (#1571)

2018-11-22 13:40:50 +00:00

src

Merge branch 'merge-point-c419605' into shams-os-merge-231118

2018-11-23 16:34:49 +00:00

build.gradle

[ENT-2539] Implement support for holding node Legal Identity keys in Ultimaco HSM (#1571)

2018-11-22 13:40:50 +00:00