Mike Jolley 1bc9da3e91 Merge branch 'master' into WC-CRUD ... # Conflicts: # includes/class-wc-coupon.php		2016-08-04 12:10:04 +01:00
..
flat-rate	[2.6] Fixed shipping classes URLs, closes #11542	2016-07-27 15:52:02 -03:00
free-shipping	Merge branch 'master' into WC-CRUD	2016-08-04 12:10:04 +01:00
legacy-flat-rate	[2.6] Fixed shipping classes URLs, closes #11542	2016-07-27 15:52:02 -03:00
legacy-free-shipping	Merge branch 'master' into WC-CRUD	2016-08-04 12:10:04 +01:00
legacy-international-delivery	Move zones to main settings	2016-01-05 11:23:15 +00:00
legacy-local-delivery	Fixed mixed tabs and spaces	2016-07-11 16:56:35 +02:00
legacy-local-pickup	Output buffering and redirects after turning off legacy	2016-04-28 12:36:51 +01:00
local-pickup	Revert price change - this breaks custom price logic	2016-06-23 16:32:24 +01:00