ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-17 02:09:50 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
e8d833c2fe
corda/node/src/main
History
Tudor Malene e8d833c2fe Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT 
# Conflicts:
#	.idea/compiler.xml
#	docs/source/changelog.rst
#	node/src/test/kotlin/net/corda/node/services/transactions/DistributedImmutableMapTests.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/NodeTestUtils.kt
#	testing/node-driver/src/main/kotlin/net/corda/testing/node/MockServices.kt
2017-11-27 16:52:29 +00:00
..
java CORDA-311-post PR merged fixes (#2106) 2017-11-23 16:34:57 +00:00
kotlin/net/corda/node Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT 2017-11-27 16:52:29 +00:00
resources Merge remote-tracking branch 'open/master' into features/ENT-1153/merge_OS2ENT 2017-11-27 16:52:29 +00:00