Merge branch 'master' of https://github.com/Harabe-x/PixaiBot

# Conflicts: # .idea/.idea.PixaiBot/.idea/workspace.xml
Harabe-x · Jul 2, 2024 · 478e863 · 478e863
2 parents ab30ecd + 7c56bab
commit 478e863
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 34 deletions.
diff --git a/.idea/.idea.PixaiBot/.idea/discord.xml b/.idea/.idea.PixaiBot/.idea/discord.xml
diff --git a/.idea/.idea.PixaiBot/.idea/indexLayout.xml b/.idea/.idea.PixaiBot/.idea/indexLayout.xml
diff --git a/.idea/.idea.PixaiBot/.idea/projectSettingsUpdater.xml b/.idea/.idea.PixaiBot/.idea/projectSettingsUpdater.xml
diff --git a/.idea/.idea.PixaiBot/.idea/workspace.xml b/.idea/.idea.PixaiBot/.idea/workspace.xml
diff --git a/PixaiBot.sln.DotSettings b/PixaiBot.sln.DotSettings