Skip to content

M
Mirai
Switch branch/tag
  1. 08 Mar, 2020 7 commits
    • Him188's avatar
      Use custom Json configuration · 1ef3eb47
      Him188 authored
      1ef3eb47
    • 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
    • Him188's avatar
      Merge remote-tracking branch 'origin/master' · 200b8b98
      Him188 authored
      200b8b98
    • Him188's avatar
      Revert "Use `io.ktor.utils.io` than `kotlinx.io`" · b1f36704
      Him188 authored 
      This reverts commit 6a85769e
      b1f36704
    • Him188's avatar
      Merge remote-tracking branch 'origin/master' · 1b1be694
      Him188 authored
      1b1be694
    • Him188's avatar
      Fix build · 1b8a87b4
      Him188 authored
      1b8a87b4
    • Him188's avatar
      0.26.0 · c334321f
      Him188 authored
      c334321f
  3. 07 Mar, 2020 13 commits
  5. 06 Mar, 2020 20 commits