Jonathan Kolyer 2ea1259060 merging feature/musician_profile_enhancements		2015-02-24 06:08:33 +00:00
..
lib	* wip	2014-12-30 17:10:16 -06:00
models	merging feature/musician_profile_enhancements	2015-02-24 06:08:33 +00:00
resque	Merge branch 'develop' into feature/jam_tracks	2015-01-04 09:31:33 -06:00
connection_manager_spec.rb	* VRFS-1073 - support multiple websocket gateways	2014-09-24 14:27:56 -05:00
mq_router_spec.rb	Conflicts:	2014-12-18 15:13:55 -06:00
recurly_client_spec.rb	VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.	2015-02-19 16:40:19 -06:00