Mike Jolley 15f47e00a2 Merge branch 'master' into feature/13088 ... # Conflicts: # assets/css/admin-rtl.css # assets/css/admin.css # assets/css/twenty-seventeen-rtl.css # assets/css/twenty-seventeen.css # assets/css/woocommerce-rtl.css # assets/css/woocommerce.css		2017-05-23 16:35:17 +01:00
..
css	Merge branch 'master' into feature/13088	2017-05-23 16:35:17 +01:00
fonts	Fixed file permissions	2017-01-17 16:31:31 -02:00
images	Adds storefront/theme step to the setup wizard	2017-05-17 17:42:18 +01:00
js	Merge pull request #14975 from tractus/master	2017-05-23 16:27:49 +01:00