• Him188's avatar
    Merge branch 'master' into kotlin-1.3.70 · e39fe5a4
    Him188 authored
    # 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
    e39fe5a4
Bot.kt 8.96 KB