aboutsummaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-05 12:03:08 +0100
committerPhilipp Prangenberg <philipp.prangenberg@derkurier.de>2016-12-05 12:03:08 +0100
commita21f436a58133f7da0cae06366d729665f3b8f9c (patch)
tree72ff1743d96f79e4a9d85b0d48715e5f9aa67cf9 /.gitmodules
parent960bf899414d89221e92138fdb98777c3f4f73ec (diff)
parent40607036c5aa6385a7ae3f3a283bf107238a5944 (diff)
downloadtrackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.gz
trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.bz2
trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..5e245cc5b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,5 @@
+[submodule "traccar-web"]
+ path = traccar-web
+ url = ../traccar-web.git
+ branch = master
+ ignore = all