Mike Jolley 352184cc06 Merge branch 'master' into shipping-zones ... # Conflicts: # assets/css/admin.css # i18n/languages/woocommerce.pot # includes/abstracts/abstract-wc-payment-gateway.php # includes/abstracts/abstract-wc-shipping-method.php # includes/admin/settings/class-wc-settings-shipping.php # includes/wc-core-functions.php # uninstall.php		2016-02-05 14:58:48 +00:00
..
html-order-download-permission.php	Make sure we esc_attr translation results	2015-08-05 14:15:00 -04:00
html-order-fee.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-order-item-meta.php	Shipping meta data	2016-01-08 11:42:32 +00:00
html-order-item.php	Shipping meta data	2016-01-08 11:42:32 +00:00
html-order-items.php	[2.5] Round tax/tax refunded amounts on display.	2016-01-25 15:18:49 +00:00
html-order-refund.php	Docblocks	2015-02-03 14:02:38 +00:00
html-order-shipping.php	Shipping meta data	2016-01-08 11:42:32 +00:00
html-product-attribute.php	Make sure we esc_attr translation results	2015-08-05 14:15:00 -04:00
html-product-download.php	Make sure we esc_attr translation results	2015-08-05 14:15:00 -04:00
html-product-variation-download.php	Make sure we esc_attr translation results	2015-08-05 14:15:00 -04:00
html-variation-admin.php	Fixed several new variations admin actions, closes #9886	2015-12-21 03:36:36 -02:00