jam 7ec4be3063 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop		2014-01-10 23:53:25 +00:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	baseline for icecast test cases	2014-01-10 23:53:16 +00:00
resque	* removing git merge syntax from jam_ruby	2014-01-09 13:53:47 +00:00
connection_manager_spec.rb	* merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852)	2013-11-16 14:05:23 +00:00
mq_router_spec.rb	* fixing nil.publish test in mq_router.spec	2014-01-07 16:01:36 +00:00