Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Wiki Updater
2020-11-28 16:49:24 +01:00
parent 7a81fde64e
commit 4deb8fd626
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@@ -102,4 +102,5 @@ newlocknew (freesound.org)
dsmolenaers (freesound.org)
Headphaze (freesound.org)
VolasYouKnow
Ángel Rodríguez Aguilera
Catchears