Mike Jolley 1076854608 Merge branch 'master' into shipping-zones ... # Conflicts: # assets/css/admin.css # includes/abstracts/abstract-wc-shipping-method.php # includes/class-wc-shipping.php # includes/shipping/flat-rate/class-wc-shipping-flat-rate.php # includes/shipping/flat-rate/includes/class-wc-eval-math.php # includes/shipping/free-shipping/class-wc-shipping-free-shipping.php # includes/shipping/legacy-international-delivery/class-wc-shipping-legacy -international-delivery.php # includes/shipping/legacy-local-delivery/class-wc-shipping-legacy-local-d elivery.php		2016-01-11 11:48:18 +00:00
..
views	Breadcrumb tweak	2016-01-08 12:10:40 +00:00
class-wc-settings-accounts.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
class-wc-settings-api.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
class-wc-settings-checkout.php	Merge branch 'master' into shipping-zones	2016-01-11 11:48:18 +00:00
class-wc-settings-emails.php	#9857 change get_class to	2015-12-16 14:25:17 +08:00
class-wc-settings-general.php	Move zones to main settings	2016-01-05 11:23:15 +00:00
class-wc-settings-integrations.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
class-wc-settings-page.php	Improve docblock comments in WC_Settings_* classes	2016-01-05 16:22:18 +01:00
class-wc-settings-products.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
class-wc-settings-shipping.php	Move zones to main settings	2016-01-05 11:23:15 +00:00
class-wc-settings-tax.php	Merge branch 'master' into shipping-zones	2016-01-11 11:48:18 +00:00