mirror of
https://github.com/KoboldAI/KoboldAI-Client.git
synced 2025-02-26 08:27:46 +01:00

This resolves two merge conflicts that arose because this branch was a few commits behind.
This resolves two merge conflicts that arose because this branch was a few commits behind.