Mike Jolley 0a9485c465 Merge branch 'master' into feature/11259 ... # Conflicts: # assets/css/admin-rtl.css # assets/css/admin.css # includes/admin/list-tables/class-wc-admin-list-table-products.php # includes/class-wc-install.php # includes/wc-update-functions.php		2017-12-04 14:14:03 +00:00
..
abstract-wc-product-importer.php	Merge branch 'master' into feature/11259	2017-12-04 14:14:03 +00:00
class-wc-product-csv-importer.php	Fix logic	2017-11-22 11:57:59 -08:00