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
..
common	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
configs	Three bugfixes	2015-05-22 18:20:45 -04:00
controllers	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
forms	Reformatted logo remove button to use Zend	2015-02-27 17:19:37 -05:00
layouts/scripts	Fix for vertical scrollbar issue	2015-04-27 13:52:55 -04:00
logging	Log all PHP errors (including parse errors) to our zend log	2015-02-02 18:03:13 -05:00
models	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
services	Fixed a repeating show bug	2015-04-15 10:48:31 -04:00
upgrade	Fix to upgrade path	2015-03-25 12:03:01 -04:00
validate	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
views	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
Bootstrap.php	Merge branch '2.5.x' into 2.5.x-installer	2015-06-16 10:37:06 -04:00
airtime-boot.php	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00