aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/org/traccar/config
diff options
context:
space:
mode:
authorGavriel Fleischer <flocsy@gmail.com>2019-11-11 00:20:13 +0200
committerGavriel Fleischer <flocsy@gmail.com>2019-11-11 00:20:13 +0200
commit8a696af4d92821ccf741c21dcbe118861008743a (patch)
tree74cd5697a87603c4b17ca84206cea9fc34d91f9f /src/main/java/org/traccar/config
parent47a1af1554b0216eae8248227407486c0eba8ef3 (diff)
parent81a7195b2efe148d47e3cf0cead0de415529bbab (diff)
downloadtrackermap-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 'src/main/java/org/traccar/config')
0 files changed, 0 insertions, 0 deletions