Mike Jolley 1b2df3dd3b Merge branch 'pr/11797' ... # Conflicts: # includes/admin/meta-boxes/class-wc-meta-box-coupon-data.php # includes/api/class-wc-rest-coupons-controller.php # includes/class-wc-coupon.php # tests/unit-tests/api/coupons.php # tests/unit-tests/coupon/crud.php		2016-09-01 11:46:05 +01:00
..
class-wc-legacy-coupon.php	Merge branch 'master' into pr/11797	2016-09-01 11:43:31 +01:00
class-wc-legacy-customer.php	Merge branch 'pr/11797'	2016-09-01 11:46:05 +01:00