ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-15 07:02:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
corda/testing
History
tudor.malene@gmail.com eb801d40b8 Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06 
# Conflicts:
#	core/src/main/kotlin/net/corda/core/cordapp/Cordapp.kt
#	core/src/main/kotlin/net/corda/core/internal/cordapp/CordappImpl.kt
#	node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
#	node/src/main/kotlin/net/corda/node/internal/NodeStartup.kt
#	node/src/main/kotlin/net/corda/node/internal/cordapp/CordappLoader.kt
2018-06-01 13:56:43 +01:00
..
node-driver
Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
2018-05-29 17:17:08 +01:00
qa/behave
ENT-1871 Rebrand R3Corda to Corda Enterprise (#838)
2018-05-31 08:59:05 +01:00
smoke-test-utils
Merge remote-tracking branch 'open/master' into kat-merge-20180517
2018-05-17 15:04:51 +01:00
test-common
Merge remote-tracking branch 'remotes/open/master' into merges/may-29-16-48
2018-05-29 17:17:08 +01:00
test-utils
Merge remote-tracking branch 'open/master' into tudor-merge-os-01_06
2018-06-01 13:56:43 +01:00