Merge branch 'master' into rewrite-qw
authorLiza Carvelli <liza@carvel.li>
Thu, 1 Aug 2024 12:09:30 +0000 (14:09 +0200)
committerLiza Carvelli <liza@carvel.li>
Thu, 1 Aug 2024 12:09:30 +0000 (14:09 +0200)
commitd3430ae43915443066359189b4b3196361eaa0a2
tree1f9ead8951c1119e53c03233f5c5bf496346f778
parent252424c802f36ceb43c2bae0c9b959368d36bc4c
parentd86afbf982ef9e5dbf46574c9d2725b3a8ea27e3
Merge branch 'master' into rewrite-qw

# Conflicts:
# QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json
# QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1052_Looking the Part.json