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-admin-page-addons.php	Refactored the addons screens to use new json files	2015-12-03 13:38:13 +00:00
html-admin-page-reports.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-admin-page-status-logs.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-admin-page-status-report.php	[2.5] Wrap report in backtick to stop people breaking .org forums	2016-02-05 09:55:51 +00:00
html-admin-page-status-tools.php	Typo fix in tools for uninstall	2015-11-06 00:10:14 +05:45
html-admin-page-status.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-admin-settings.php	Move zones to main settings	2016-01-05 11:23:15 +00:00
html-bulk-edit-product.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-email-template-preview.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-notice-install.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-notice-template-check.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-notice-theme-support.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-notice-tracking.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-notice-update.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
html-quick-edit-product.php	Add Js Validation for price and dimension field in product quick edit panel	2015-11-12 04:50:57 +05:45
html-report-by-date.php	Removed period for file headers	2015-11-03 11:53:50 -02:00