Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-11 22:51:08 +02:00
commit 201749fb13
2 changed files with 5 additions and 5 deletions

8
.gitmodules vendored
View File

@ -158,10 +158,6 @@
path = inventorycheck path = inventorycheck
url = https://sys4.fr/gitea/nalc/inventorycheck.git url = https://sys4.fr/gitea/nalc/inventorycheck.git
branch = nalc branch = nalc
[submodule "irc"]
path = irc
url = https://sys4.fr/gitea/nalc/irc.git
branch = nalc
[submodule "irc_commands"] [submodule "irc_commands"]
path = irc_commands path = irc_commands
url = https://sys4.fr/gitea/nalc/irc_commands.git url = https://sys4.fr/gitea/nalc/irc_commands.git
@ -562,3 +558,7 @@
path = moreblocks path = moreblocks
url = https://sys4.fr/gitea/nalc/moreblocks.git url = https://sys4.fr/gitea/nalc/moreblocks.git
branch = nalc branch = nalc
[submodule "irc"]
path = irc
url = https://sys4.fr/gitea/nalc/irc.git
branch = nalc

2
irc

@ -1 +1 @@
Subproject commit 6a7053582da1a5c97e6702c70525ca4bdc02dae7 Subproject commit 0f00fa8c7e1bb96fc47f43f0f91801e30a5843e8