Scott Comer ca27a6ab97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop ... Conflicts: db/manifest		2014-05-08 19:47:17 -05:00
..
jam_ruby	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2014-05-08 19:47:17 -05:00
mailers	VRFS-1483 final cleanup	2014-04-05 22:13:28 +00:00
support	* fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)	2014-05-01 14:09:33 -05:00
factories.rb	* merging develop into feature/scheduled_sessions	2014-05-07 15:04:41 -05:00
spec_db.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00
spec_helper.rb	Merge branch 'develop' into vrfs925	2014-04-14 10:59:58 +00:00
uses_temp_files.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00