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
..
active_music_session_cleaner_spec.rb	* VRFS-1403 - maxmind single step import done	2014-07-19 21:11:16 -05:00
audiomixer_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00
google_analytics_event_spec.rb	* wip	2014-05-06 08:34:38 -05:00
icecast_config_worker_spec.rb	* 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
icecast_source_check_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00
jam_tracks_cleaner_spec.rb	Dedicated spec for testing cleaner. Some cleanup/renaming.	2014-12-15 23:57:57 -06:00
music_session_scheduler_spec.rb	VRFS-2072 copy all 1-time cancellations instead of just the first	2014-08-24 15:12:38 -04:00
quick_mixer_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00
scheduled_music_session_cleaner_spec.rb	VRFS-2282 tests and music session time queries	2014-10-14 03:54:58 +00:00
unused_music_notation_cleaner_spec.rb	Initial merge and manual conflict and fix for tests.	2014-11-04 14:55:12 -06:00