ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 08:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
42b4b80545
corda/confidential-identities/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/kotlin/net/corda/confidential Using X509Certificate consistently throughout, rather than BC's X509CertificateHolder. (#2305) 2018-01-03 22:00:39 +00:00
test/kotlin/net/corda/confidential Merge commit '22af527b7943c0c4376af582de6505893817111a' into andr3ej-ross-merge 2017-12-19 17:07:17 +00:00