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

..

runConfigurations

ENT-1986: Extend node HA test scenario to support LinearState. (#893)

2018-05-31 11:14:59 +01:00

scopes

Add an IntelliJ scope that covers the currently supported Corda API.

2017-09-27 11:47:34 +02:00

codeStyleSettings.xml

Initial stub for IntelliJ Code Style settings (#1832)

2017-10-09 13:24:17 +01:00

compiler.xml

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

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