diff options
| author | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
|---|---|---|
| committer | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
| commit | f6256f240c2fabe5d26efa7e88e69c2de19a6786 (patch) | |
| tree | e832fa79f8fe9a78085e0b14b35f2bac5afe3006 /conf/script_athena.conf | |
| parent | 9ad304f22b698d69e7d41cc4cdfe53bf16d5d552 (diff) | |
| parent | c62e768cc51f9607b85642c78d32cbcbc519f880 (diff) | |
| download | serverdata-magic.tar.gz serverdata-magic.tar.bz2 serverdata-magic.tar.xz serverdata-magic.zip | |
Merge branch 'master' into 'magic'magic
# Conflicts:
# world/map/db/const.txt
# world/map/npc/magic/event-summon-managuardian.txt
Diffstat (limited to 'conf/script_athena.conf')
0 files changed, 0 insertions, 0 deletions