josecoll 4e42fff7d4 Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)		2017-12-13 12:34:06 +00:00
..
java/net/corda/core	Fix broken integration test following rebase from OS master (mostly test utils identity constant redefinitions / renaming)	2017-12-13 12:34:06 +00:00
kotlin/net/corda/core	Merge remote-tracking branch 'open-hc02/master' into colljos-os-hc02-merge-121217	2017-12-13 11:02:58 +00:00