diff options
| author | Philipp Prangenberg <philipp.prangenberg@derkurier.de> | 2016-12-05 12:03:08 +0100 |
|---|---|---|
| committer | Philipp Prangenberg <philipp.prangenberg@derkurier.de> | 2016-12-05 12:03:08 +0100 |
| commit | a21f436a58133f7da0cae06366d729665f3b8f9c (patch) | |
| tree | 72ff1743d96f79e4a9d85b0d48715e5f9aa67cf9 /src/org/traccar/ServerManager.java | |
| parent | 960bf899414d89221e92138fdb98777c3f4f73ec (diff) | |
| parent | 40607036c5aa6385a7ae3f3a283bf107238a5944 (diff) | |
| download | trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.gz trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.tar.bz2 trackermap-server-a21f436a58133f7da0cae06366d729665f3b8f9c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/org/traccar/ServerManager.java')
| -rw-r--r-- | src/org/traccar/ServerManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/ServerManager.java b/src/org/traccar/ServerManager.java index 010438a44..953428b8f 100644 --- a/src/org/traccar/ServerManager.java +++ b/src/org/traccar/ServerManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2016 Anton Tananaev (anton.tananaev@gmail.com) + * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. |