projects / busui.git / commitdiff
search:
summary | shortlog | log | commit | commitdiff | tree
side by side | plain
Merge branch 'master' of https://github.com/maxious/ACTBus-ui
Merge branch 'master' of https://github.com/maxious/ACTBus-ui

Conflicts:
include/common-db.inc.php

file:a/index.php -> file:b/index.php 
--- a/index.php
+++ b/index.php
@@ -28,5 +28,4 @@
 echo ' <a href="labs/index.php" data-role="button" data-icon="beaker">Busness R&amp;D</a>';
 include_footer(true)
 ?>
-
Unnamed repository; edit this file to name it for gitweb.
GitPHP by Chris Han