Anthony Keenan 4708c62de4 Merge remote-tracking branch 'open/master' into os-merge-20180724 ...

# Conflicts:
#	CONTRIBUTORS.md
#	docs/source/contributing.rst
#	docs/source/corda-configuration-file.rst
#	docs/source/index.rst
#	node/src/integration-test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTest.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	settings.gradle

2018-07-24 11:33:21 +01:00

..

ext

ENT-1955 - Fix TOC for HTML and PDF (#1244)

2018-07-10 13:30:08 +01:00

source

Merge remote-tracking branch 'open/master' into os-merge-20180724

2018-07-24 11:33:21 +01:00

.gitignore

CORDA-1585 - Tidy up participate docs + pdf toctree backport (#3674)

2018-07-24 10:05:57 +01: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 virtualenv installable if the checkout path has whitespace. (#1187)

2017-08-18 13:31:00 +01:00

make-docsite.sh

Fixes (#1050)

2018-06-21 16:35:20 +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