Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks ... Conflicts: db/manifest pb/src/client_container.proto ruby/lib/jam_ruby.rb web/config/environments/development.rb web/config/environments/test.rb		2015-01-04 09:31:33 -06:00
..
lib	* wip	2014-12-30 17:10:16 -06:00
models	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
resque	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
connection_manager_spec.rb	* VRFS-1073 - support multiple websocket gateways	2014-09-24 14:27:56 -05:00
mq_router_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00