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

Browse Source

Conflicts:
	src/Fedex/Rate.php
	src/UPS/Rate.php
	src/USPS/Rate.php
	tests/ShipTest.php

...

This commit is contained in:

Troy Davisson 2014-11-30 21:42:33 -05:00

parent 3dbfc3e135 6f41a5954b

commit b911e8923d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available