diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-12 13:49:59 +1200 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2018-06-12 13:49:59 +1200 |
| commit | 69a4af1c2b419fd7cc6356bcc2bf760969a73f95 (patch) | |
| tree | 4192ef221be88b024d96422e274836f4c6b33922 /templates | |
| parent | 1dc1e06cfd4b7b23775984a254723b2d06b4f1dd (diff) | |
| parent | 86ad45c63c9a9e9bee59a8cc621416e1396f9c89 (diff) | |
| download | trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.gz trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.tar.bz2 trackermap-server-69a4af1c2b419fd7cc6356bcc2bf760969a73f95.zip | |
Merge branch 'master' into netty4
# Conflicts:
# src/org/traccar/protocol/AquilaProtocolDecoder.java
# src/org/traccar/protocol/L100FrameDecoder.java
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/export/stops.xlsx | bin | 11699 -> 11062 bytes |
| -rw-r--r-- | templates/export/summary.xlsx | bin | 11592 -> 10812 bytes |
| -rw-r--r-- | templates/export/trips.xlsx | bin | 9299 -> 11374 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/templates/export/stops.xlsx b/templates/export/stops.xlsx Binary files differindex e4a5248ca..1892f7c9a 100644 --- a/templates/export/stops.xlsx +++ b/templates/export/stops.xlsx diff --git a/templates/export/summary.xlsx b/templates/export/summary.xlsx Binary files differindex 94d2b9e79..a4d55d721 100644 --- a/templates/export/summary.xlsx +++ b/templates/export/summary.xlsx diff --git a/templates/export/trips.xlsx b/templates/export/trips.xlsx Binary files differindex ef803bc4b..6536011e3 100644 --- a/templates/export/trips.xlsx +++ b/templates/export/trips.xlsx |