feature-32-discordsrv #17

Merged
cuqmbr merged 4 commits from feature-32 into develop 2025-07-15 09:56:16 +00:00
Showing only changes of commit cb09ece53c - Show all commits

View File

@ -38,14 +38,9 @@ src/plugins/FancyNpcs/logs
src/plugins/FancyNpcs/skins
src/plugins/FancyNpcs/.data
<<<<<<< HEAD
src/plugins/DiscordSRV/accounts.aof
=======
src/plugins/ImageFrame/data
src/plugins/ImageFrame/player
src/plugins/ImageFrame/upload
src/map-color-cache.dat
>>>>>>> develop
src/plugins/DiscordSRV/accounts.aof