Mike Jolley d55653a408 Merge branch 'master' into fix-13498 ... # Conflicts: # includes/class-wc-order.php # tests/unit-tests/crud/data.php		2017-03-15 15:52:40 +00:00
..
coupon.php	Cant use ::CLASS in php 5.2	2017-03-14 08:42:08 -07:00
data-store.php	Merge branch 'master' into fix-13498	2017-03-15 15:52:40 +00:00
data.php	Merge branch 'master' into fix-13498	2017-03-15 15:52:40 +00:00
functions.php	Fix test	2016-12-14 11:07:39 +00:00