Jonathan Kolyer e539157d76 Merge branch 'develop' into vrfs988		2014-01-12 02:53:11 -06:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	Merge branch 'develop' into vrfs988	2014-01-12 02:53:11 -06:00
resque	* VRFS-801 still working out some mixer devops issues now;	2014-01-13 22:48:55 +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