tudor.malene@gmail.com 81932b4e88 Merge branch 'open_master' into corda/tudor-os-merge ... # Conflicts: # settings.gradle # verifier/build.gradle # verifier/src/integration-test/kotlin/net/corda/verifier/GeneratedLedger.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierDriver.kt # verifier/src/integration-test/kotlin/net/corda/verifier/VerifierTests.kt # verifier/src/main/kotlin/net/corda/verifier/Verifier.kt		2018-03-15 10:21:35 +00:00
..
capsule	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00
lib	Oracle 11xe and 12c database compatibility (#206)	2018-01-29 18:35:58 +00:00
src	Merge branch 'open_master' into corda/tudor-os-merge	2018-03-15 10:21:35 +00:00
build.gradle	Merge from Corda/OS	2018-03-14 17:24:47 +00:00