gitphp 0.2.9.1 :: busui.git/commit

projects / busui.git / commit

Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
include/common-template.inc.php

about.php		blob \| diff \| history \| plain
feedback.php		blob \| diff \| history \| plain
include/common-geo.inc.php		blob \| diff \| history \| plain
include/common-template.inc.php		blob \| diff \| history \| plain
index.php		blob \| diff \| history \| plain
labs/index.php		blob \| diff \| history \| plain
routeList.php		blob \| diff \| history \| plain
stop.php		blob \| diff \| history \| plain
stopList.php		blob \| diff \| history \| plain
trip.php		blob \| diff \| history \| plain

Unnamed repository; edit this file to name it for gitweb.

RSS Atom