Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-06-02 12:34:06 +02:00
commit 540616d055

2
.gitmodules vendored
View File

@ -452,7 +452,7 @@
branch = nalc branch = nalc
[submodule "inventory_icon"] [submodule "inventory_icon"]
path = inventory_icon path = inventory_icon
url = https://sys4.fr/gitea/nalc/inventory_icon.git url = https://sys4.fr/gitea/nalc/minetest_inventory_icon.git
branch = nalc branch = nalc
[submodule "pipeworks"] [submodule "pipeworks"]
path = pipeworks path = pipeworks