tudor.malene@gmail.com 29a8c153ed Merge branch 'master' into tudor_merge_os_24_10 ... # Conflicts: # core/src/main/kotlin/net/corda/core/internal/JarSignatureCollector.kt # core/src/main/kotlin/net/corda/core/transactions/LedgerTransaction.kt # core/src/main/kotlin/net/corda/core/transactions/TransactionBuilder.kt # core/src/main/kotlin/net/corda/core/utilities/KotlinUtils.kt # core/src/test/kotlin/net/corda/core/contracts/PackageOwnershipVerificationTests.kt # core/src/test/kotlin/net/corda/core/internal/JarSignatureCollectorTest.kt # node/src/main/kotlin/net/corda/node/internal/cordapp/JarScanningCordappLoader.kt # node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt # testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TestDSL.kt # testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt # testing/test-utils/src/main/kotlin/net/corda/testing/internal/MockCordappProvider.kt		2018-10-24 17:09:30 +01:00
..
ext	CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)	2018-07-24 10:05:57 +01:00
source	Merge branch 'master' into tudor_merge_os_24_10	2018-10-24 17:09:30 +01:00
.gitignore	CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)	2018-07-24 10:05:57 +01:00
build.gradle	CORDA-692 Don't include internal packages in API documentation (#2415)	2018-01-25 15:26:13 +00:00
index.html	Added a convenience HTML file for redirecting to the main docs.	2016-11-22 11:56:46 +00:00
install-docsite-requirements.sh	Make virtualenv installable if the checkout path has whitespace. (#1187)	2017-08-18 13:31:00 +01:00
make-docsite.sh	[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)	2018-06-13 09:43:16 +01:00
Makefile	[CORDA-1612]: Fix truncated code snippets in docs PDF (#3347)	2018-06-13 09:43:16 +01:00
packages.md	[CORDA-1035] Testing api KDoc Updates (#2584)	2018-02-28 13:26:49 +00:00
requirements.txt	Docs: Docs: switch from ReCommonMark to m2r, as RCM is not really maintained and is buggy.	2018-05-15 16:59:35 +02:00