merge upstream 🐈

This commit is contained in:
Milan* 2017-05-25 10:03:55 +02:00
commit 36a47fd92e
2 changed files with 2 additions and 1 deletions

2
.gitmodules vendored
View File

@ -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

1
mods/irc Submodule

@ -0,0 +1 @@
Subproject commit 070eb512364ca2d9321c1397619320e15a8a8e74