Skip to content
Snippets Groups Projects
Commit 86d28833 authored by Micksha's avatar Micksha
Browse files

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
parents ea8a3a85 6577092d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment