merge upstream

36a47fd9 · Milan · 60971dc1 · 30d169c6 · 36a47fd9 · 070eb512
Commit 36a47fd9 authored 7 years ago by Milan
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,7 +85,7 @@
 	url = https://github.com/tenplus1/protector
 [submodule "mods/irc"]
 	path = mods/irc
-	url = https://github.com/minetest-mods/irc
+	url = https://github.com/kaeza/minetest-irc/
 [submodule "mods/ethereal"]
 	path = mods/ethereal
 	url = https://git.tchncs.de/Illuna-Minetest/ethereal

--- a/irc @ 070eb512
+++ b/irc @ 070eb512
+Subproject commit 070eb512364ca2d9321c1397619320e15a8a8e74