Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud ... Conflicts: airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/public/js/airtime/preferences/preferences.js		2015-06-26 10:37:30 -04:00
..
application	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
build	Add downgrade action to UpgradeController, fix SoundCloud schema and bugs	2015-06-24 18:38:04 -04:00
library	Merge saas-dev into soundcloud	2015-06-10 16:08:52 -04:00
locale	Merge branch '2.5.x-installer' into saas-dev	2015-06-17 14:11:30 -04:00
public	Merge branch 'saas-dev' into soundcloud	2015-06-26 10:37:30 -04:00
tests	Celery backend and support for dev-env worker parallelization	2015-06-12 12:31:55 -04:00