Him188 e39fe5a46f Merge branch 'master' into kotlin-1.3.70 ... # Conflicts: # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/highway.kt # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/WtLogin.kt # mirai-core/build.gradle.kts # mirai-core/src/androidMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt # mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt # mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/channels.kt # mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/chunked.kt # mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/io/input.kt # mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/addSuppressed.kt		2020-03-08 00:29:51 +08:00
..
mirai/test	Revert "Use ktor.io than kotlinx.io"	2020-03-07 18:49:59 +08:00
net/mamoe/mirai	Kotlin 1.3.70	2020-03-05 09:44:50 +08:00