Merge branch 'stable-1.0' into stable-1.1

2019-05-13 20:09:29 +02:00 · 2019-05-13 20:09:29 +02:00 · e8a5e6b63e
parent 3e9024355c 81ed7a369c
commit e8a5e6b63e
1 changed files with 4 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,7 +1,3 @@
-[submodule "areas"]
-	path = areas
-	url = https://sys4.fr/gitea/nalc/areas.git
-	branch = nalc
 [submodule "armor_monoid"]
 	path = armor_monoid
 	url = https://sys4.fr/gitea/nalc/armor_monoid.git
@ -562,3 +558,7 @@
 	path = action_timers
 	url = https://sys4.fr/gitea/mff/action_timers.git
 	branch = master
+[submodule "areas"]
+	path = areas
+	url = https://sys4.fr/gitea/nalc/areas.git
+	branch = nalc