Merge remote-tracking branch 'origin/master'

2020-06-08 11:52:27 -04:00
parent cac6041583 b9ccc528e9
commit bb9855e830
9 changed files with 1 additions and 1 deletions
--- a/core/assets-raw/sprites/units/chaos-array-base.png
+++ b/core/assets-raw/sprites/units/chaos-array-base.png
--- a/core/assets-raw/sprites/units/chaos-array-cell.png
+++ b/core/assets-raw/sprites/units/chaos-array-cell.png
--- a/core/assets-raw/sprites/units/chaos-array-leg.png
+++ b/core/assets-raw/sprites/units/chaos-array-leg.png
--- a/core/assets-raw/sprites/units/chaos-array.png
+++ b/core/assets-raw/sprites/units/chaos-array.png
--- a/core/assets-raw/sprites/units/eradicator-base.png
+++ b/core/assets-raw/sprites/units/eradicator-base.png
--- a/core/assets-raw/sprites/units/eradicator-cell.png
+++ b/core/assets-raw/sprites/units/eradicator-cell.png
--- a/core/assets-raw/sprites/units/eradicator-leg.png
+++ b/core/assets-raw/sprites/units/eradicator-leg.png
--- a/core/assets-raw/sprites/units/eradicator.png
+++ b/core/assets-raw/sprites/units/eradicator.png
--- a/core/assets/contributors
+++ b/core/assets/contributors
@@ -88,4 +88,4 @@ Alicila
 Daniel Dusek
 DeltaNedas
 GioIacca9
-SnakkiZXZ
+SnakkiZXZ