aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorLibravatar Amine Mouafik <amine@mouafik.fr>2019-12-23 19:00:31 +0100
committerLibravatar Amine Mouafik <amine@mouafik.fr>2019-12-23 19:00:31 +0100
commit968634e927da3f4cfe792d2b82bbf6f186ec192d (patch)
treed7287c4e3c9d506aae0b7e1262eda583a3c020f7 /.gitmodules
parentMerge branch 'develop' into fix/audio-video-on-macos (diff)
parentUpdate loading message in default lang (diff)
downloadferdium-app-968634e927da3f4cfe792d2b82bbf6f186ec192d.tar.gz
ferdium-app-968634e927da3f4cfe792d2b82bbf6f186ec192d.tar.zst
ferdium-app-968634e927da3f4cfe792d2b82bbf6f186ec192d.zip
Merge branch 'develop' into fix/audio-video-on-macos
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 78e0c5221..81b6b6246 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,8 @@
3 url = https://github.com/getferdi/recipes.git 3 url = https://github.com/getferdi/recipes.git
4 ignore = all 4 ignore = all
5 branch = master 5 branch = master
6[submodule "src/server"] 6[submodule "src/internal-server"]
7 path = src/server 7 path = src/internal-server
8 url = https://github.com/getferdi/internal-server.git 8 url = https://github.com/getferdi/internal-server.git
9 ignore = all 9 ignore = all
10 branch = master 10 branch = master