Scott Comer 94421c03c0 merge conflict with db/manifest resolved		2014-05-21 21:33:38 -05:00
..
lib	* VRFS-971 adding progress at bottom of fotor	2014-01-08 18:04:11 +00:00
models	merge conflict with db/manifest resolved	2014-05-21 21:33:38 -05:00
resque	* merging develop into feature/scheduled_sessions	2014-05-07 15:04:41 -05:00
connection_manager_spec.rb	* merging develop into feature/scheduled_sessions	2014-05-07 15:04:41 -05:00
mq_router_spec.rb	* wip	2014-05-06 08:34:38 -05:00