Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/forms/EmailServerPreferences.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/Preferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_email_server.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/menu.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml		2012-11-06 17:23:32 -05:00
..
application	Merge branch '2.2.x' into 2.2.x-saas	2012-11-06 17:23:32 -05:00
build	CC-4636: Exception happens when trying to remove user that have created some smart block	2012-11-01 17:45:28 -04:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
public	CC-4607: Library: Please make the 'Add x items' following mouse's point	2012-11-06 16:34:06 -05:00
tests	test commit	2012-10-29 19:19:48 -04:00