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
4ecc7e9ace
corda/client/jfx/src
History
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
2017-09-26 18:08:47 +01:00
..
integration-test/kotlin/net/corda/client/jfx Moved ServiceInfo and ServiceType into internal package (#1599) 2017-09-22 10:15:03 +01:00
main/kotlin/net/corda/client/jfx Merge remote-tracking branch 'remotes/open/master' into enterprise-merge-september-26 2017-09-26 18:08:47 +01:00
test/kotlin/net/corda/client/jfx/utils Replace unused variables with _ after kotlin 1.1.1 upgrade (#456) 2017-03-29 13:54:40 +01:00