Mike Jolley 1076854608 Merge branch 'master' into shipping-zones ... # Conflicts: # assets/css/admin.css # includes/abstracts/abstract-wc-shipping-method.php # includes/class-wc-shipping.php # includes/shipping/flat-rate/class-wc-shipping-flat-rate.php # includes/shipping/flat-rate/includes/class-wc-eval-math.php # includes/shipping/free-shipping/class-wc-shipping-free-shipping.php # includes/shipping/legacy-international-delivery/class-wc-shipping-legacy -international-delivery.php # includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d elivery.php		2016-01-11 11:48:18 +00:00
..
class-wc-shipping-local-pickup.php	Merge branch 'master' into shipping-zones	2016-01-11 11:48:18 +00:00