Seth Call 3bac8252e9 * fixing websocket tests		2014-12-18 16:26:56 -06:00
..
amqp	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
app	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00
constants	VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.	2014-11-16 16:23:31 -06:00
errors	VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots	2014-10-25 22:23:52 -04:00
geodata	* wip	2014-07-14 15:53:04 -05:00
lib	Conflicts:	2014-12-18 15:13:55 -06:00
models	Conflicts:	2014-12-18 15:13:55 -06:00
resque	Conflicts:	2014-12-18 15:13:55 -06:00
base_manager.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
connection_manager.rb	* fixing websocket tests	2014-12-18 16:26:56 -06:00
database.rb	* VRFS-1992 finished (daily session email improvements)	2014-08-01 16:17:04 -05: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	Conflicts:	2014-12-18 15:13:55 -06:00
mq_router.rb	Conflicts:	2014-12-18 15:13:55 -06:00
version.rb	* bumping gems to be version 0.1.X to match debs	2013-09-18 20:35:20 +00:00