tudor.malene@gmail.com d97d64d954 Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11 ...

# Conflicts:
#	core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt
#	core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/flows/FlowOverrideTests.kt
#	node/src/main/kotlin/net/corda/node/serialization/kryo/Kryo.kt

2018-11-01 16:58:28 +00:00

..

capsule

Merge commit 'df4699c69abc8aab7e1e44b602c762212cbf93f6' into chrisr3-os-merge

2018-09-17 14:01:09 +01:00

dist

Merge pull request #1420 from roastario/disable_os_x_build_of_installer

2018-10-16 11:38:46 +01:00

lib

Integration tests in database mode - add Oracle 12.1 JDBC driver directly into libs dir (#1399)

2018-09-19 20:49:00 +01:00

src

Merge remote-tracking branch 'open/master' into tudor-os-merge-1-11

2018-11-01 16:58:28 +00:00

build.gradle

Merge remote-tracking branch 'remotes/open/master' into merges/os-merge-2018-10-30

2018-10-30 14:10:01 +00:00