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
..
source	Merge branch 'open_master' into corda/tudor-os-merge	2018-03-15 10:21:35 +00:00
build.gradle	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00
index.html	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00
install-docsite-requirements.sh
make-docsite.sh
Makefile
packages.md	[CORDA-1035] Testing api KDoc Updates (#2584)	2018-02-28 13:26:49 +00:00
requirements.txt