merge upstream 🐱

2017-03-18 20:56:32 +01:00 · 2017-03-18 20:56:32 +01:00 · 0f7a29f035
parent a17260c8e9 ff43f66f7d
commit 0f7a29f035
2 changed files with 2 additions and 2 deletions
--- a/mods/ethereal
+++ b/mods/ethereal
@ -1 +1 @@
-Subproject commit 32712ae74025afe1bd989798fec286412a64573f
+Subproject commit 36d1e37150b1d0d6609d0d1197bee93b292c0134
--- a/mods/illuna_ethereal
+++ b/mods/illuna_ethereal
@ -1 +1 @@
-Subproject commit 38df4c419e6bb6499c966f6abd97f5508e0d0c93
+Subproject commit 1a95ecc463bb220e9bc089fee0cab86d01deee69