github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-09 11:30:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
ff3bd74abf
mirai/mirai-core
History
liujiahua123123 ff3bd74abf Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/client/login/ClientPasswordSubmissionPacket.kt
#	mirai-core/src/main/java/net/mamoe/mirai/network/packet/server/ServerPacket.kt
2019-08-17 23:00:49 +08:00
..
src Merge remote-tracking branch 'origin/master' 2019-08-17 23:00:49 +08:00
pom.xml update 2019-08-17 17:49:45 +08:00