Merge branch 'stable-1.0' into stable-1.1

[irc] Change l'URL du submodule ./irc
2019-05-11 22:51:08 +02:00 · 2019-05-11 22:45:52 +02:00
2 changed files with 5 additions and 5 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -158,10 +158,6 @@
 	path = inventorycheck
 	url = https://sys4.fr/gitea/nalc/inventorycheck.git
 	branch = nalc
-[submodule "irc"]
-	path = irc
-	url = https://sys4.fr/gitea/nalc/irc.git
-	branch = nalc
 [submodule "irc_commands"]
 	path = irc_commands
 	url = https://sys4.fr/gitea/nalc/irc_commands.git
@ -562,3 +558,7 @@
 	path = moreblocks
 	url = https://sys4.fr/gitea/nalc/moreblocks.git
 	branch = nalc
+[submodule "irc"]
+	path = irc
+	url = https://sys4.fr/gitea/nalc/irc.git
+	branch = nalc
--- a/2
+++ b/2
Author	SHA1	Message	Date
sys4	201749fb13	Merge branch 'stable-1.0' into stable-1.1	2019-05-11 22:51:08 +02:00
sys4	0bde07f591	[irc] Change l'URL du submodule ./irc	2019-05-11 22:45:52 +02:00