Merge branch 'master' of github.com:maxious/ACTBus-ui
author maxious
()
committer maxious
()
commit 41f2ec6cc9e4fadd923d045047239079a2634368
tree 38cedc5f562b4ef84bf1784b087260b7d0a85332
parent 80b478caca80ade71bb04de6346e59dcad059e32
parent 3bcf5a7262cd20693822d73fcefd6c7801143261
Merge branch 'master' of github.com:maxious/ACTBus-ui
17 files changed:
about.php
aws/busuidb.sh
geo/route.kml.php
include/common-db.inc.php
include/common-request.inc.php
include/common-session.inc.php
include/common-template.inc.php
include/common-transit.inc.php
include/db/route-dao.inc.php
include/db/stop-dao.inc.php
include/db/trip-dao.inc.php
routeList.php
servicealerts/index.php
servicealerts/servicealert_viewer.php [ new file with mode 0644 ]
stop.php
stopList.php
trip.php