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
..
integration-test	Create basic bridge module and capsule build	2018-03-14 11:08:09 +00:00
main	Merge branch 'open_master' into corda/tudor-os-merge	2018-03-15 10:21:35 +00:00
test	Create basic bridge module and capsule build	2018-03-14 11:08:09 +00:00