Merge branch 'master' of github.com:pdt256/shipping

Conflicts:
	src/Fedex/Rate.php
	src/UPS/Rate.php
	src/USPS/Rate.php
	tests/ShipTest.php
pull/3/head
Troy Davisson 10 years ago
commit b911e8923d

Diff Content Not Available