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
..
languages	Merge branch 'master' into shipping-zones	2016-01-11 11:48:18 +00:00
states	Merge branch 'master' into shipping-zones	2016-01-04 14:35:45 +00:00
continents.php	Some US states are countries	2015-12-08 12:39:17 +00:00
countries.php	Some US states are countries	2015-12-08 12:39:17 +00:00
locale-info.php	Add Bangladeshi Locale Information	2015-08-19 04:40:24 +06:00