aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-10-27 13:07:36 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-10-27 13:07:36 +1300
commit64e149b69750fdc6f150a18e39a3df1ba76ccc24 (patch)
tree48b6fc996f389f102e496426a8d34cadd6011d8e
parent968e77c5c4a8f79f1069dde4fe19a1b86f8c9a6c (diff)
downloadtrackermap-server-64e149b69750fdc6f150a18e39a3df1ba76ccc24.tar.gz
trackermap-server-64e149b69750fdc6f150a18e39a3df1ba76ccc24.tar.bz2
trackermap-server-64e149b69750fdc6f150a18e39a3df1ba76ccc24.zip
Add traccar-web as a submodule
-rw-r--r--.gitmodules3
-rw-r--r--debug.xml2
m---------traccar-web0
l---------web1
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..fecd50d3e
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "traccar-web"]
+ path = traccar-web
+ url = git@github.com:tananaev/traccar-web.git
diff --git a/debug.xml b/debug.xml
index 779a7e3c5..755508aa6 100644
--- a/debug.xml
+++ b/debug.xml
@@ -11,7 +11,7 @@
<entry key='web.port'>8082</entry>
<!--<entry key='web.application'>../traccar-web/traccar-web.war</entry>
<entry key='web.old'>true</entry>-->
- <entry key='web.path'>web</entry>
+ <entry key='web.path'>traccar-web/web</entry>
<entry key='web.debug'>true</entry>
<entry key='web.console'>true</entry>
<entry key='web.timeout'>30000</entry>
diff --git a/traccar-web b/traccar-web
new file mode 160000
+Subproject f6915ca3bf4e8c2d9df5eb4cd5283614d4dd747
diff --git a/web b/web
deleted file mode 120000
index 1649d3676..000000000
--- a/web
+++ /dev/null
@@ -1 +0,0 @@
-../traccar-web/web \ No newline at end of file