Viktor Kolomeyko 61a8bd0a5a Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge ...

# Conflicts:
#	samples/attachment-demo/src/integration-test/kotlin/net/corda/attachmentdemo/AttachmentDemoTest.kt

2018-07-09 16:45:20 +01:00

..

src

Merge remote-tracking branch 'open/master' into feature/vkolomeyko/os-merge

2018-07-09 16:45:20 +01:00

build.gradle

ENT-2105: Remove unnecessary sourceSets from integration tests. (#1029)

2018-06-20 15:38:48 +01:00