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
..
data	Merge branch 'master' into kotlin-1.3.70	2020-03-08 00:29:51 +08:00
FriendMessage.kt	Make quoteReply common to MessagePacket	2020-02-23 01:01:20 +08:00
GroupMessage.kt	Simplify calls	2020-03-03 10:26:50 +08:00
MessagePacket.kt	Merge branch 'master' into kotlin-1.3.70	2020-03-08 00:29:51 +08:00
MessageReceipt.kt	Rename toChain to asMessageChain, add more java-friendly apis	2020-03-03 09:31:01 +08:00
MessageType.kt	Add copyright	2020-02-09 01:01:36 +08:00