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
..
form-add-payment-method.php	[2.5] Only show payment method button when needed, and check for required fields	2016-01-20 10:47:36 +00:00
form-edit-account.php	Added password strength meter to my account > edit account page	2016-01-22 17:33:35 -02:00
form-edit-address.php	[2.5] get_currentuserinfo() is deprecated in WP 4.5	2016-01-18 14:42:01 +00:00
form-login.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
form-lost-password.php	Add strict comparission on another templates	2015-11-14 20:35:00 -06:00
my-account.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
my-address.php	Move zones to main settings	2016-01-05 11:23:15 +00:00
my-downloads.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
my-orders.php	Made "my orders" columns fully customisable for filters.	2015-11-27 12:54:28 +00:00
view-order.php	Removed period for file headers	2015-11-03 11:53:50 -02:00