mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-13 01:08:35 +00:00
Merge branch 'master' into Playerbot
# Conflicts: # src/server/game/World/World.h
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -22,9 +22,7 @@
|
||||
!/env/docker/data/.gitkeep
|
||||
!/env/docker/etc/
|
||||
/env/docker/etc/*
|
||||
!/env/docker/etc/authserver.conf.dockerdist
|
||||
!/env/docker/etc/worldserver.conf.dockerdist
|
||||
!/env/docker/etc/dbimport.conf.dockerdist
|
||||
!/env/docker/etc/*.conf.dockerdist
|
||||
!/env/docker/logs/.gitkeep
|
||||
/.env*
|
||||
/apps/joiner
|
||||
|
||||
Reference in New Issue
Block a user