Conflicts: airtime_mvc/public/index.php * Reverted some SaaS-only thing Martin did a year ago. Looks benign but only one way to find out... |
||
---|---|---|
.. | ||
css | ||
images/datatables | ||
install | ||
js | ||
.htaccess | ||
favicon.ico | ||
index.php | ||
robots.txt |
Conflicts: airtime_mvc/public/index.php * Reverted some SaaS-only thing Martin did a year ago. Looks benign but only one way to find out... |
||
---|---|---|
.. | ||
css | ||
images/datatables | ||
install | ||
js | ||
.htaccess | ||
favicon.ico | ||
index.php | ||
robots.txt |