rick.parker cb810f0660 Merge remote-tracking branch 'remotes/open/master' into parkri-os-merge-20180613-1 ...

# Conflicts:
#	.idea/compiler.xml
#	build.gradle
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/config/NodeConfigurationImplTest.kt

2018-06-13 11:13:43 +01:00

..

capsule

ENT-1871 Rebrand R3Corda to Corda Enterprise (#907)

2018-06-02 10:47:31 +01:00

dist

Update configuration files to remove references to StateMachineConfiguration

2018-05-31 08:56:37 +01:00

lib

Oracle 11xe and 12c database compatibility (#206)

2018-01-29 18:35:58 +00:00

src

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

2018-06-13 11:13:43 +01:00

build.gradle

remove runtime dependency on launcher for node as the capsule launching process is still used if not running from official distribution

2018-06-08 14:22:06 +01:00