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
..
conditional-functions.php	Fixed php docs standards	2015-11-03 11:31:20 -02:00
core-functions.php	Fix - Unit test for woocommerce currencies	2016-01-27 12:02:43 +05:45
install.php	Zone unit tests	2016-01-08 14:53:24 +00:00
log.php	Fixed php docs standards	2015-11-03 11:31:20 -02:00
main-class.php	Fixed php docs standards	2015-11-03 11:31:20 -02:00
notice-functions.php	Fixed php docs standards	2015-11-03 11:31:20 -02:00
validation.php	Fixed php docs standards	2015-11-03 11:31:20 -02:00