diff options
author | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-11 00:20:13 +0200 |
---|---|---|
committer | Gavriel Fleischer <flocsy@gmail.com> | 2019-11-11 00:20:13 +0200 |
commit | 8a696af4d92821ccf741c21dcbe118861008743a (patch) | |
tree | 74cd5697a87603c4b17ca84206cea9fc34d91f9f /setup/default.xml | |
parent | 47a1af1554b0216eae8248227407486c0eba8ef3 (diff) | |
parent | 81a7195b2efe148d47e3cf0cead0de415529bbab (diff) | |
download | trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.tar.gz trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.tar.bz2 trackermap-server-8a696af4d92821ccf741c21dcbe118861008743a.zip |
Merge branch 'master' into set-language
# Conflicts:
# src/main/java/org/traccar/StringProtocolEncoder.java
# src/main/java/org/traccar/protocol/WatchProtocolEncoder.java
Diffstat (limited to 'setup/default.xml')
-rw-r--r-- | setup/default.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml index 1452137c3..f1f3ab517 100644 --- a/setup/default.xml +++ b/setup/default.xml @@ -275,5 +275,7 @@ <entry key='rst.port'>5196</entry> <entry key='pt215.port'>5197</entry> <entry key='pacifictrack.port'>5198</entry> + <entry key='topin.port'>5199</entry> + <entry key='outsafe.port'>5200</entry> </properties> |