Jonathan Kolyer 2ee96c49ec merging develop		2014-04-30 14:21:23 +00:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	merging develop	2014-04-30 14:21:23 +00:00
resque	change join_the_session api to add tracks; move the impl to connection; a few bug fixes	2014-04-30 22:01:43 -05:00
connection_manager_spec.rb	a small cleanup of connection fields and fix broken tests	2014-05-02 13:44:29 -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