aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-29 12:20:29 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-10-29 12:20:29 +1300
commit3868f6a5092019a480335af6eeabf8093d16dde2 (patch)
tree8cc01d70751571ad61a6efc88b8034192242a9f7
parent1a3f093028a040dce147e4c451f4808776ff2080 (diff)
downloadtraccar-server-3868f6a5092019a480335af6eeabf8093d16dde2.tar.gz
traccar-server-3868f6a5092019a480335af6eeabf8093d16dde2.tar.bz2
traccar-server-3868f6a5092019a480335af6eeabf8093d16dde2.zip
Use same branch as main repo
-rw-r--r--.gitmodules2
m---------traccar-web0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 3c5e3a5c7..0f1e76a12 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "traccar-web"]
path = traccar-web
url = ../traccar-web.git
- branch = master
+ branch = .
diff --git a/traccar-web b/traccar-web
-Subproject f6915ca3bf4e8c2d9df5eb4cd5283614d4dd747
+Subproject 854476dcd9bb9b3b48d297cb7369cfe719c492f