diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-10-10 11:06:19 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-10-10 11:06:19 +0000 |
| commit | af234f546317933cfaeac330ba233c42c84f490b (patch) | |
| tree | 41d3f164bfd395224055a10a86e6600133732ebe /npc/_import.txt | |
| parent | 87de0f8f42baa647ea15126e69f6cac28b4f5d92 (diff) | |
| parent | 43bfffe1fec74604e94961fa73e254f8a5ddc0e6 (diff) | |
| download | serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.gz serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.bz2 serverdata-af234f546317933cfaeac330ba233c42c84f490b.tar.xz serverdata-af234f546317933cfaeac330ba233c42c84f490b.zip | |
Merge branch 'merchanthouse' into 'master'
Merchanthouse
See merge request evol/serverdata!202
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index c19f2e32..b821d9d9 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -83,6 +83,7 @@ @include "npc/008-2-29/_import.txt" @include "npc/008-2-3/_import.txt" @include "npc/008-2-30/_import.txt" +@include "npc/008-2-32/_import.txt" @include "npc/008-2-4/_import.txt" @include "npc/008-2-5/_import.txt" @include "npc/008-2-6/_import.txt" |