Shams Asari fdc31091a6 Merge branch 'feature-network-parameters' into shams-master-merge-291117 ... # Conflicts: # constants.properties # gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Cordform.kt # gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt		2017-11-30 12:05:42 +00:00
..
main	Merge branch 'feature-network-parameters' into shams-master-merge-291117	2017-11-30 12:05:42 +00:00
noderunner/kotlin/net/corda/plugins	CORDA-728 fixed the issue with node runner on mac. Also did a tiny bit of readability refactoring.	2017-10-26 15:26:50 +01:00