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

Browse Source

# Conflicts:
#	mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/ExternalImage.kt
#	mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/Mirai.kt

...

This commit is contained in:

Him188 2020-05-02 16:57:45 +08:00

parent 2be325d781 41fb08f3f1

commit 68045ea7af

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available