Scott Comer b54e7d1ca1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop		2014-03-05 20:30:54 -06:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2014-03-05 20:30:54 -06:00
resque	* removed is_downloadable for VRFS-1141, from database and UI	2014-02-22 05:09:39 +00:00
connection_manager_spec.rb	removed updating with with connection location attributes	2014-03-04 18:48:29 -06:00
mq_router_spec.rb	* fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006)	2014-01-19 02:20:44 +00:00