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
..
files	VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool).	2014-12-15 18:02:51 -06:00
jam_ruby	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
mailers	* fix test	2014-10-13 09:48:34 -05:00
support	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
factories.rb	Conflicts:	2014-12-18 15:13:55 -06:00
spec_db.rb	wip	2014-05-29 14:34:18 -05:00
spec_helper.rb	* fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting	2014-12-31 20:39:22 -06:00
uses_temp_files.rb	merging jam-ruby into ruby	2013-09-15 18:04:03 +00:00