github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-24 23:20:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/japt' into japt

Browse Source 
# Conflicts:
#	mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/packet/event/MemberJoin.kt
#	mirai-japt/mirai-japt.postfixTemplates
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingContact.java
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingGroup.java
#	mirai-japt/src/main/java/net/mamoe/mirai/japt/BlockingQQ.java
#	mirai-japt/src/main/kotlin/net/mamoe/mirai/japt/BlockingContactsImpl.kt
This commit is contained in:
Him188 2020-01-11 23:54:21 +08:00
commit b2ceb98371
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available