Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/Block.php airtime_mvc/public/css/styles.css		2012-09-12 15:55:43 -04:00
..
css	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-12 15:55:43 -04:00
images/datatables	…
install	CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.	2012-02-12 11:43:34 -05:00
js	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-09-12 15:55:43 -04:00
.htaccess	CC-3698: php5-fpm service with airtime pool won't start because of php_admin_value[phar.readonly] = off	2012-04-22 13:45:38 -04:00
favicon.ico	…
index.php	switch defaults for verbose stack trace	2012-09-12 11:51:11 -04:00
robots.txt	CC-3933: Remove version number and date strings from login page footer, add robots.txt	2012-06-08 10:51:10 -04:00