ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-01 02:36:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
13619df0b1
corda/core/src
History
Shams Asari 13619df0b1 Merge remote-tracking branch 'open/master' into shams-os-merge-040118 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/utilities/registration/NodeRegistrationTest.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
#	testing/test-utils/src/main/kotlin/net/corda/testing/dsl/TransactionDSLInterpreter.kt
2018-01-04 10:58:44 +00:00
..
main Merge remote-tracking branch 'open/master' into shams-os-merge-040118 2018-01-04 10:58:44 +00:00
smoke-test/kotlin/net/corda/core Merge Open Source into Enterprise 2017-12-05 17:35:54 +00:00
test Merge remote-tracking branch 'open/master' into shams-os-merge-040118 2018-01-04 10:58:44 +00:00