Steven Bazyl 8510735db8 Resolve merge conflict, update rspec syntax		2014-12-15 13:32:54 -08:00
..
compat	Merge pull request #13 from sanemat/multi-json-in-rails-case	2012-12-30 11:20:01 -08:00
google	Resolve merge conflict, update rspec syntax	2014-12-15 13:32:54 -08:00
cacerts.pem	Bundle root certs	2013-05-31 15:38:00 -07:00