Merge branch 'master' into Playerbot

# Conflicts: # src/server/game/Guilds/Guild.cpp
2022-11-18 10:21:36 -07:00
parent 5996f1f1af 2ae3f40847
commit cab0d6f027
312 changed files with 104564 additions and 1583 deletions
@@ -68,9 +68,7 @@ nbproject/
 *.kate-swp
 .browse.VC*
 .idea
-cmake-build-debug/*
-cmake-build-debug-coverage/*
-cmake-build-debug-event-trace/*
+cmake-build-*/*
 coverage-report/

 #