Jonathan Kolyer bf1e315b48 Merge branch 'develop' into vrfs925		2014-04-14 10:59:58 +00:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	* fixing some broken tests	2014-04-09 21:11:13 +00:00
resque	VRFS-925 finishing up tests	2014-04-14 10:57:21 +00:00
connection_manager_spec.rb	* VRFS-1372 resolved, and not requiring local only until figure out some deployment issues	2014-03-07 14:20:34 -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