Albert Santoni a17001a90a Merge branch 'saas' into saas-dev ... Conflicts: airtime_mvc/application/views/scripts/billing/upgrade.phtml airtime_mvc/public/css/billing.css		2015-09-02 10:47:37 -04:00
..
application	Merge branch 'saas' into saas-dev	2015-09-02 10:47:37 -04:00
build	CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user	2015-09-01 16:10:33 -04:00
library	Merge saas-dev into soundcloud	2015-06-10 16:08:52 -04:00
locale	updated translation resources	2015-08-31 17:07:52 +00:00
public	Merge branch 'saas' into saas-dev	2015-09-02 10:47:37 -04:00
tests	Celery backend and support for dev-env worker parallelization	2015-06-12 12:31:55 -04:00