Him188 b175119f0f Merge branch 'master' into dev ... # Conflicts: # buildSrc/src/main/kotlin/Versions.kt # gradle.properties # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.common.kt # mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/highway/HighwayHelper.kt # mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/LoginFailedException.kt # mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/event/JvmMethodListeners.kt # mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/internal/retryCatching.jvm.kt # settings.gradle		2020-08-16 01:57:07 +08:00
..
src/main/java/test	Update license	2020-08-16 01:49:30 +08:00
build.gradle.kts	Explicit api mode	2020-07-20 15:06:30 +08:00