Viktor Kolomeyko df6c6b99cd Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge ... # Conflicts: # samples/irs-demo/src/integration-test/kotlin/net/corda/test/spring/SpringDriver.kt		2018-04-06 09:19:34 +01:00
..
integration-test/kotlin/net/corda/testing	ENT-1566 Fixes for db integration tests + ENT-1575 db migrations for db attachment changes (#521)	2018-03-09 09:52:44 +00:00
main/kotlin/net/corda/testing	Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge	2018-04-06 09:19:34 +01:00
test	Introduced copyright in all source files. (#519)	2018-03-06 17:29:21 +00:00