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
..
abstract-wc-integration.php	Settings api	2015-12-14 14:03:46 +00:00
abstract-wc-order.php	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00
abstract-wc-payment-gateway.php	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00
abstract-wc-product.php	Add filter to is_in_stock	2016-02-01 11:09:12 -08:00
abstract-wc-session.php	Removed period for file headers	2015-11-03 11:53:50 -02:00
abstract-wc-settings-api.php	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00
abstract-wc-shipping-method.php	Merge branch 'master' into shipping-zones	2016-02-05 14:58:48 +00:00
abstract-wc-widget.php	Improve phpdoc comments for methods in abstract WC_Widget class	2016-01-04 15:37:12 +01:00