Mike Jolley 1348f6efd7 Merge branch 'master' into db-schema-tweaks ... # Conflicts: # includes/admin/class-wc-admin-duplicate-product.php		2017-02-16 16:33:20 +00:00
..
class-emogrifier.php	PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket	2016-09-02 04:33:57 +03:00
class-wc-eval-math.php	Tidy up includes	2017-02-16 11:46:01 +00:00
wp-async-request.php	Tidy up includes	2017-02-16 11:46:01 +00:00
wp-background-process.php	Merge branch 'master' into db-schema-tweaks	2017-02-16 16:33:20 +00:00