mirror of
https://github.com/corda/corda.git
synced 2025-01-27 22:59:54 +00:00
sollecitom
9284e731c0
Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26
# Conflicts: # core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt # node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/Kryo.kt # settings.gradle
Languages
Kotlin
94.3%
Java
2.5%
C++
2.1%
Python
0.3%
Shell
0.3%
Other
0.3%