Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones ... # Conflicts: # assets/css/admin.css # i18n/languages/woocommerce.pot # includes/abstracts/abstract-wc-payment-gateway.php # includes/abstracts/abstract-wc-shipping-method.php # includes/admin/settings/class-wc-settings-shipping.php # includes/wc-core-functions.php # uninstall.php		2016-02-05 14:58:48 +00:00
..
includes	Add methods from zones screen	2016-01-13 15:04:10 +00:00
class-wc-shipping-flat-rate.php	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00