Duncan Sommerville 62b4de5162 Merge branch 'saas' into saas-dev ... Conflicts: airtime_mvc/application/views/scripts/systemstatus/index.phtml		2015-06-18 10:24:44 -04:00
..
application	Move misplaced tag	2015-06-18 10:03:12 -04:00
build	Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup	2015-06-17 14:49:12 -04:00
library	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00
locale	Merge branch '2.5.x-installer' into saas-dev	2015-06-17 14:11:30 -04:00
public	Add soundcloud callback file for saas routing	2015-06-17 17:39:37 -04:00
tests	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00