Merge branch 'master' of github.com:maxious/ACTBus-ui
author maxious
()
committer maxious
()
commit 9e5320a4379e0f1feca1bae3f52052b52f011d33
tree 6321857074ea539519f238dfef5850addc4a0045
parent bd1648c7e216962fd37858e5b48662d382fcf787
parent 314cc603be210e66dcda561cb785463f8bebbf09
Merge branch 'master' of github.com:maxious/ACTBus-ui

Conflicts:
include/common-db.inc.php
aws/awsStartup.sh
aws/pg_hba.conf [ new file with mode 0644 ]
include/common-db.inc.php