Mike Jolley f739e97c76 Merge branch 'master' into payment-gateway-wizard-refactor ... # Conflicts: # assets/css/activation.css # assets/css/wc-setup.css		2016-04-19 13:25:20 +01:00
..
css	Merge branch 'master' into payment-gateway-wizard-refactor	2016-04-19 13:25:20 +01:00
fonts	Updates the WooCommerce icon font. #9791	2016-03-09 10:54:00 +00:00
images	Adjusts logos	2016-04-19 12:04:52 +01:00
js	Merge branch 'master' into payment-gateway-wizard-refactor	2016-04-19 13:25:20 +01:00