Merge branch 'master' of github.com:maxious/ACTBus-ui
author Maxious
()
committer Maxious
()
commit 8a79694d825dfaaeef67810be5828b52922b3e47
tree 2bac6c37f2a1984bb5e7ce35a5243f7c4417fc9b
parent 138a5e1f91cd80558e9f5a28b15592e76777cccf
parent 490aa8fe959767afedc42fb0f70cd2bf7bb86701
Merge branch 'master' of github.com:maxious/ACTBus-ui
11 files changed:
geo/route.kml.php
geo/stops.kml.php
geo/trip.kml.php [ new file with mode 0755 ]
include/common-net.inc.php
include/common-session.inc.php
include/common-template.inc.php
include/db/trip-dao.inc.php
myway/myway_timeliness_calculate.php
stop.php
stopList.php
trip.php