Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2018-01-07 17:48:47 -05:00
commit 37f9e1394f

View File

@ -6,7 +6,7 @@
A pixelated sandbox tower defense game made using [LibGDX](https://libgdx.badlogicgames.com/). Winner of the [GDL Metal Monstrosity Jam](https://itch.io/jam/gdl---metal-monstrosity-jam).
_[Issue tracker](https://waffle.io/Anuken/Mindustry)_
_[Issue tracker](https://waffle.io/Anuken/Mindustry)_
_[TODO list](TODO.md)_
_[Wiki](http://mindustry.wikia.com/wiki/Mindustry_Wiki)_
_[Discord](https://discord.gg/r8BkXNd)_