Steven Miers d5a8959677 Merge with develop.		2015-06-03 14:22:21 -05:00
..
lib	* wip	2014-12-30 17:10:16 -06:00
models	Merge with develop.	2015-06-03 14:22:21 -05:00
resque	* VRFS-2680 - adding redirect logic for ssl	2015-05-11 16:52:58 -05:00
connection_manager_spec.rb	VRFS-3242 : Schema and model changes required for band profile functionality.	2015-05-13 21:06:14 -05:00
jam_track_importer_spec.rb	* prepare production db for preview URLS, and save jam_track after setting duration in the sync task	2015-04-22 09:44:57 -05:00
jam_tracks_manager_spec.rb	* VRFS-2909 - jam tracks importer	2015-03-09 09:44:12 -05:00
mq_router_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00
recurly_client_spec.rb	* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases	2015-04-10 15:19:08 -05:00