sollecitom 70b32636b5 Merge remote-tracking branch 'remotes/open/master' into merges/april-27-09-38 ...

# Conflicts:
#	docs/source/changelog.rst
#	node-api/src/main/kotlin/net/corda/nodeapi/internal/config/ConfigUtilities.kt
#	node/src/main/kotlin/net/corda/node/services/config/NodeConfiguration.kt

2018-04-27 10:12:15 +01:00

..

runConfigurations

Merge remote-tracking branch 'open/master' into merges/march-21-16-24

2018-03-21 16:30:31 +00: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 merges/april-27-09-38

2018-04-27 10:12:15 +01:00