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
..
jackson	CORDA-716 Move non-API things to internal (#2256)	2017-12-17 18:44:35 +00:00
jfx	Merge remote-tracking branch 'open/master' into colljos-merge-160118	2018-01-16 12:13:49 +00:00
mock	Reformat files in client	2017-10-09 15:26:39 +01:00
rpc	Merge commit '6edf95506bb2bd96ebffade9b9dd82d468cd4252' into enterprise	2018-01-18 16:48:05 +00:00