Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	pom.xml
#	src/main/java/cn/lunadeer/miniplayertitle/MiniPlayerTitle.java
#	src/main/java/cn/lunadeer/miniplayertitle/PlayerTitle.java
#	src/main/java/cn/lunadeer/miniplayertitle/Shop.java
#	src/main/java/cn/lunadeer/miniplayertitle/utils/ConfigManager.java
#	src/main/java/cn/lunadeer/miniplayertitle/utils/Database.java
#	src/main/java/cn/lunadeer/miniplayertitle/utils/XLogger.java

...

This commit is contained in:

zhangyuheng 2024-01-09 11:11:34 +08:00

parent 52805b0720 e83e4578bb

commit 08ea2c9a5a

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