szymonsztuka f5c9a398ad Merge remote-tracking branch 'remotes/open/master' into merges/os-2018-06-04-szymon ...

# Conflicts:
#	docs/source/upgrade-notes.rst
#	node/src/integration-test/kotlin/net/corda/node/BootTests.kt

2018-06-04 17:35:19 +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 merges/os-2018-06-04-szymon

2018-06-04 17:35:19 +01:00

build.gradle

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

2018-05-25 14:19:15 +01:00