jiahua.liu 3ae1832ac1 Merge remote-tracking branch 'origin/master' ... # Conflicts: # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt		2020-01-30 13:25:53 +08:00
..
androidMain/kotlin/net/mamoe/mirai	Slider captcha solver	2020-01-29 23:53:18 +08:00
androidTest/java	Delete EcdhCrypt.java	2020-01-08 08:04:08 +08:00
commonMain/kotlin/net.mamoe.mirai	Merge remote-tracking branch 'origin/master'	2020-01-30 13:25:53 +08:00
commonTest/kotlin/net.mamoe.mirai.test	Fix bugs	2020-01-07 19:26:49 +08:00
jvmMain/kotlin/net/mamoe/mirai	network handler update	2020-01-30 13:23:58 +08:00
jvmTest/kotlin	Fix bugs	2020-01-07 19:26:49 +08:00
main	Remove application tag in AndroidManifest.xml	2019-12-06 17:32:02 +08:00