Andrzej Cichocki f3c5ae2ff6 Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise ... # Conflicts: # docs/source/changelog.rst # node/src/main/kotlin/net/corda/node/services/messaging/P2PMessagingClient.kt		2018-01-18 16:48:05 +00:00
..
capsule	Merge from R3 Corda 3.0 Dev Preview release branch to master	2018-01-13 11:00:01 +00:00
src	Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise	2018-01-18 16:48:05 +00:00
build.gradle	Fixing stuff	2017-12-18 15:39:08 +00:00