drigato 9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LoginController.php airtime_mvc/application/controllers/plugins/Acl_plugin.php		2014-08-28 11:59:41 -04:00
..
sql	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-04-23 15:58:39 -04:00
airtime-php.logrotate	CC-4119: zendphp.log is not rotated	2012-08-20 16:05:25 -04:00
airtime.conf	Changed default base directory in airtime.conf and api_client.cfg	2013-01-15 13:47:35 -05:00
build.properties	CC-5709: Airtime Analyzer	2014-03-21 14:03:17 -04:00
runtime-conf.xml	CC-5651: Unit Test the Scheduler	2014-01-13 11:43:17 -05:00
schema.xml	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-08-28 11:59:41 -04:00