aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorRafael Guterres <guterresrafael@gmail.com>2015-11-27 03:46:47 -0200
committerRafael Guterres <guterresrafael@gmail.com>2015-11-27 03:46:47 -0200
commit1a25796d62bdf88f2cba0387a09e2eb71599e588 (patch)
tree532c32341faa343eb03fc45eced9b0a6cd0df4dd /.travis.yml
parentca06e8d38c0bbd5a68e63ebada8e115da252b055 (diff)
downloadtrackermap-server-1a25796d62bdf88f2cba0387a09e2eb71599e588.tar.gz
trackermap-server-1a25796d62bdf88f2cba0387a09e2eb71599e588.tar.bz2
trackermap-server-1a25796d62bdf88f2cba0387a09e2eb71599e588.zip
Merge tananaev/master
Conflicts: src/org/traccar/web/WebServer.java
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions