Shams Asari 07995e0eb0 Merge remote-tracking branch 'open/master' into os-merge-d5b5825 ...

# Conflicts:
#	CONTRIBUTORS.md
#	tools/explorer/src/main/kotlin/net/corda/explorer/Main.kt

2018-06-28 15:10:58 +01:00

..

corda_dev_ca.cer

Add switchable HTTPS to Node web server

2016-08-30 13:07:40 +01:00

generalnodea.conf

Docs: Removed remaining references to webAddress in the node config (#3467)

2018-06-28 15:03:27 +01:00

generalnodeb.conf

Docs: Removed remaining references to webAddress in the node config (#3467)

2018-06-28 15:03:27 +01:00

jolokia-access.xml

Introduced copyright in all source files. (#519)

2018-03-06 17:29:21 +00:00

log4j2.xml

Merge remote-tracking branch 'remotes/open/master' into merges/june-05-09-57

2018-06-05 09:58:28 +01:00

nameservernode.conf

Docs: Removed remaining references to webAddress in the node config (#3467)

2018-06-28 15:03:27 +01:00