Mike Jolley c757fd9940 Merge branch 'shipping-zone-modals' ... # Conflicts: # assets/css/admin.css # assets/css/admin.scss		2016-03-31 15:20:06 +01:00
..
css	Merge branch 'shipping-zone-modals'	2016-03-31 15:20:06 +01:00
fonts	Updates the WooCommerce icon font. #9791	2016-03-09 10:54:00 +00:00
images	replaces .png credit card icons with .svg alternatives. closes #9675	2016-03-07 12:15:42 +00:00
js	Extra error handling	2016-03-31 15:18:35 +01:00