Merge remote-tracking branch 'origin/patch-1' into patch-1 · Wynntils/Wynntils-Legacy@9346fe7 · GitHub

This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

Commit

Merge remote-tracking branch 'origin/patch-1' into patch-1

Browse files

# Conflicts:
#	src/main/java/com/wynntils/webapi/profiles/UpdateProfile.java

Loading branch information

ENORMOUZ committed Sep 3, 2023

2 parents f1cc01a + 1feaf69 commit 9346fe7