woocommerce/includes/gateways/cod
Mike Jolley 4fa5ec8310 Merge branch 'master' of https://github.com/woothemes/woocommerce
Conflicts:
	includes/gateways/cod/class-wc-gateway-cod.php
2014-05-08 15:06:20 +01:00
..
class-wc-gateway-cod.php Merge branch 'master' of https://github.com/woothemes/woocommerce 2014-05-08 15:06:20 +01:00