tudor.malene@gmail.com 98a4fe1ce3 Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap ... # Conflicts: # node/src/integration-test/kotlin/net/corda/node/amqp/AMQPBridgeTest.kt		2018-03-06 11:37:30 +00:00
..
jackson	CORDA-696 - Create separate transaction types for contract upgrade transactions (#2589)	2018-02-26 11:29:25 +00:00
jfx	Merge remote-tracking branch 'open/master' into anthony-os-merge-2	2018-02-28 16:55:15 +00:00
mock	Reformat files in client	2017-10-09 15:26:39 +01:00
rpc	Merge remote-tracking branch 'open/master' into merge/tudor_network_bootstrap	2018-03-06 11:37:30 +00:00