Matthew Nesbit 0f98a1cbcd Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702 ...

# Conflicts:
#	node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt

2018-07-02 11:31:18 +01:00

..

capsule

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

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

dist

Merge pull request #1087 from corda/add_licence_to_installer_2

2018-06-29 15:58:08 +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 mnesbit-merge-20180702

2018-07-02 11:31:18 +01:00

build.gradle

ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)

2018-06-20 15:38:48 +01:00