Steven Bazyl 74134bf873 Resolve merge conflict, update rspec syntax and docs		2014-12-15 13:41:10 -08:00
..
api_client	Resolve merge conflict, update rspec syntax	2014-12-15 13:32:54 -08:00
api_client_spec.rb	Resolve merge conflict, update rspec syntax and docs	2014-12-15 13:41:10 -08:00