Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release		2014-05-05 10:50:47 -05:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	* merging in master with heartbeat fixes into develop after release	2014-05-05 10:50:47 -05:00
resque	* merging in master with heartbeat fixes into develop after release	2014-05-05 10:50:47 -05:00
connection_manager_spec.rb	* merging in master with heartbeat fixes into develop after release	2014-05-05 10:50:47 -05: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