Duncan Sommerville 87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev		2015-06-25 14:13:25 -04:00
..
application	Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev	2015-06-25 14:13:25 -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	SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences	2015-06-25 14:13:09 -04:00
tests	Merge branch '2.5.x-installer' into saas-installer-albert	2015-05-22 16:05:29 -04:00