Jonathan Kolyer e5d23cc3bd merge conflicts		2014-01-08 18:45:34 -06:00
..
amqp	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
app	VRFS-933 notification bug fixes	2014-01-05 16:42:18 -05:00
constants	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2014-01-06 20:35:41 +00:00
errors	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
lib	* audiomixer move	2014-01-08 21:49:04 +00:00
models	merge conflicts	2014-01-08 18:45:34 -06:00
resque	* adding resque to websocket-gateway	2014-01-09 02:53:04 +00:00
base_manager.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
connection_manager.rb	* VRFS-946 - in-session recording	2014-01-05 03:47:23 +00:00
dbutil.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
environment.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
init.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
message_factory.rb	* DownloadAvailable proto msg added to help poke client when downloads become available	2014-01-08 21:24:21 +00:00
mq_router.rb	VRFS-933 notification work	2014-01-02 14:57:16 -05:00
version.rb	* bumping gems to be version 0.1.X to match debs	2013-09-18 20:35:20 +00:00