szymonsztuka f701bc1b9a Merge commit 'ad23bb875482b7b8e17c64fb37342d0d6a5ce94d' into feature/test-merge-szymon ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt		2018-01-02 11:54:29 +00:00
..
src	Merge commit 'ad23bb875482b7b8e17c64fb37342d0d6a5ce94d' into feature/test-merge-szymon	2018-01-02 11:54:29 +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