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
..
flat-rate	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00
free-shipping	Add methods from zones screen	2016-01-13 15:04:10 +00:00
legacy-flat-rate	Note that legacy methods are no longer available once disabled	2016-01-08 12:01:01 +00:00
legacy-free-shipping	Note that legacy methods are no longer available once disabled	2016-01-08 12:01:01 +00:00
legacy-international-delivery	Move zones to main settings	2016-01-05 11:23:15 +00:00
legacy-local-delivery	Note that legacy methods are no longer available once disabled	2016-01-08 12:01:01 +00:00
legacy-local-pickup	Note that legacy methods are no longer available once disabled	2016-01-08 12:01:01 +00:00
local-pickup	Merge branch 'master' into shipping-zones	2016-01-11 11:48:18 +00:00