Albert Santoni 8c9981a155 Merge branch '2.5.x' into 2.5.x-installer ... Conflicts: airtime_mvc/public/index.php		2015-06-16 10:37:06 -04:00
..
css	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
fonts	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
images/datatables	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
install	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
js	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
setup	Installer tweaks and a pypo bugfix	2015-02-10 18:06:46 -05:00
.htaccess	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
favicon.ico	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
index.php	Log all PHP errors (including parse errors) to our zend log	2015-02-02 18:03:13 -05:00
robots.txt	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00