Shams Asari cc6113ff06 Merge remote-tracking branch 'open/master' into shams-os-merge-040118
# Conflicts:
#	gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
2018-01-05 10:09:12 +00:00
..
2017-06-05 13:37:23 +01:00

Please refer to the documentation in <corda-root>/doc/build/html/running-a-node.html#cordformation.