Auto stash before merge of "master" and "origin/master"

c575d267 · Jan Meissner · 18177a59 · 18177a59 · c575d267 · 18177a59
Commit c575d267 authored Mar 28, 2019 by Jan Meissner
--- a/Assets/_Game/Graphics/Environment/Traps/Axt_1.png
+++ b/Assets/_Game/Graphics/Environment/Traps/Axt_1.png
--- a/Assets/_Game/Graphics/Environment/Traps/Axt_2.png
+++ b/Assets/_Game/Graphics/Environment/Traps/Axt_2.png
--- a/Assets/_Game/Graphics/Environment/Traps/Axt_3.png
+++ b/Assets/_Game/Graphics/Environment/Traps/Axt_3.png
--- a/Assets/_Game/Graphics/Environment/Traps/Axt_4.png
+++ b/Assets/_Game/Graphics/Environment/Traps/Axt_4.png
--- a/Assets/_Game/Graphics/Environment/Traps/Axt_5.png
+++ b/Assets/_Game/Graphics/Environment/Traps/Axt_5.png
--- a/Assets/_Game/Graphics/Environment/Traps/Kette(1).png
+++ b/Assets/_Game/Graphics/Environment/Traps/Kette(1).png
--- a/Assets/_Game/Graphics/Environment/Traps/Kette_Kugel(1).png
+++ b/Assets/_Game/Graphics/Environment/Traps/Kette_Kugel(1).png