Mike Jolley ab57909bb7 Merge remote-tracking branch 'origin/master' ... # Conflicts: # assets/css/admin.css		2016-03-29 14:28:58 +01:00
..
css	Merge remote-tracking branch 'origin/master'	2016-03-29 14:28:58 +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	Zones screen feedback	2016-03-24 14:08:26 +00:00