Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests.		2014-11-04 14:55:12 -06:00
..
admin	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
assets	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
controllers	* VRFS-2104 - client update dialog happens when it needs to; not just on startup	2014-08-31 10:30:59 -05:00
helpers	* icecast working locally on my mac (VRFS-1002)	2014-01-21 14:51:03 +00:00
mailers	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
models	VRFS-1576 error handling; referral page; new admin menu	2014-04-22 01:55:40 +00:00
uploaders	* VRFS-1089 - jamadmin creation of recordings done	2014-02-13 16:41:50 +00:00
views	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00