diff options
| author | Micksha <ms-shaman@gmx.de> | 2019-02-12 22:57:52 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2019-02-12 22:57:52 +0000 |
| commit | 86d28833a76fe71e45228e13ea42edc716a9d549 (patch) | |
| tree | a2457b6a333a5059800594c12ea5e5695b489d88 /npc/001-1/_import.txt | |
| parent | ea8a3a85aeec360e13f83ff3f3f7ca40f709283b (diff) | |
| parent | 6577092d3a28f8d2c64e0c4d3e56b71799968e81 (diff) | |
| download | serverdata-86d28833a76fe71e45228e13ea42edc716a9d549.tar.gz serverdata-86d28833a76fe71e45228e13ea42edc716a9d549.tar.bz2 serverdata-86d28833a76fe71e45228e13ea42edc716a9d549.tar.xz serverdata-86d28833a76fe71e45228e13ea42edc716a9d549.zip | |
Merge branch 'weapons' into 'master'
Add the chopstick and the axe that were accidentially merged in client-data already
See merge request evol/serverdata!147
Diffstat (limited to 'npc/001-1/_import.txt')
0 files changed, 0 insertions, 0 deletions