Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud ... Conflicts: airtime_mvc/application/configs/constants.php		2015-06-29 10:02:58 -04:00
..
ACL.php	Fix permissions for SoundCloud functionality	2015-06-24 14:48:38 -04:00
airtime-conf-production.php	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
airtime-conf.php	CC-6046, CC-6045, CC-6047 - New SoundCloud implementation	2015-06-03 16:57:17 -04:00
application.ini	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
classmap-airtime-conf.php	SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager	2015-06-16 15:10:08 -04:00
conf.php	Merge saas-dev into soundcloud	2015-06-10 16:08:52 -04:00
config-check.php	Update installer to work with saas branch	2015-06-23 19:02:55 -04:00
constants.php	Merge branch 'saas-dev' into soundcloud	2015-06-29 10:02:58 -04:00
db-conf.php	Reverted commit mistakenly changing file modifiers to 755	2015-01-14 20:45:03 -05:00
navigation.php	Replace all timestamp strings with constant	2015-06-26 14:42:52 -04:00