Steven Bazyl 8510735db8 Resolve merge conflict, update rspec syntax		2014-12-15 13:32:54 -08:00
..
api_client	Resolve merge conflict, update rspec syntax	2014-12-15 13:32:54 -08:00
api_client_spec.rb	RSpec 3 syntax	2014-10-08 12:02:36 +00:00