denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LocaleController.php airtime_mvc/application/views/scripts/library/library.phtml airtime_mvc/application/views/scripts/playlist/playlist.phtml airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js		2012-11-20 16:56:18 -05:00
..
plugins	increase mem warning limit to 30MB	2012-09-12 15:44:26 -04:00
ApiController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
AudiopreviewController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
DashboardController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
ErrorController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
IndexController.php	CC-4090: Make code style PSR compliant	2012-07-15 21:17:13 -04:00
LibraryController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
ListenerstatController.php	CC-4661: Listener Statistics	2012-11-07 16:26:31 -05:00
LocaleController.php	Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime	2012-11-20 16:56:18 -05:00
LoginController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
PlaylistController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
PlayouthistoryController.php	CC-2184: Hardcoded CSS path should be relative path instead	2012-10-19 11:09:34 -04:00
PluploadController.php	CC-2184: Hardcoded CSS path should be relative path instead	2012-10-19 11:09:34 -04:00
PreferenceController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
ScheduleController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
ShowbuilderController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
SystemstatusController.php	CC-2184: Hardcoded CSS path should be relative path instead	2012-10-19 11:09:34 -04:00
UserController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
UsersettingsController.php	removed benchmarking	2012-09-19 16:36:04 -04:00
WebstreamController.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00