github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-05 07:30:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,103 Commits 68 Branches 330 Tags 107 MiB
092aecf607
Commit Graph

4 Commits

Author SHA1 Message Date
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
Him188
45eea16fd5 Update license 2020-08-16 01:49:30 +08:00
Him188
719b5ac7b5 Explicit api mode 2020-07-20 15:06:30 +08:00
Him188
15527b56d8 Add compatibility tests 2020-04-22 13:54:50 +08:00