Andrzej Cichocki a652c8b19f Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge ... # Conflicts: # docs/source/changelog.rst		2017-12-19 17:07:17 +00:00
..
src	Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge	2017-12-19 17:07:17 +00:00
build.gradle	Overhaul of the Bank of Corda demo to fix two problems it had:	2017-11-29 14:48:05 +00:00