aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-12-08 11:00:28 +0000
committerng0 <ng0@n0.is>2019-12-08 11:00:28 +0000
commit9975d6f250dee9a4d599d2c144b3700646290ca3 (patch)
treed64aac0ce4e15c370319c05d636d07fca8d8a312 /.gitmodules
parenteda66aa43040d9196b61a1a7e0bad7e7c5dee693 (diff)
parent2b9a55a928876e5d3ae3baa2908a99269880383a (diff)
downloadwww-9975d6f250dee9a4d599d2c144b3700646290ca3.tar.gz
www-9975d6f250dee9a4d599d2c144b3700646290ca3.zip
Merge branch 'master' into stable
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules
index d21ef0d6..1cb35121 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
1[submodule "help"]
2 path = help
3 url = git://taler.net/help
4 branch = master
5 ignore = dirty
6[submodule "build-system/taler-build-scripts"] 1[submodule "build-system/taler-build-scripts"]
7 path = build-system/taler-build-scripts 2 path = build-system/taler-build-scripts
8 url = git://git.taler.net/build-common 3 url = git://git.taler.net/build-common
9 ignore = dirty 4 ignore = dirty
5[submodule "inc"]
6 path = inc
7 url = https://git.gnunet.org/www_shared.git
8 branch = default
9 ignore = dirty