Mike Jolley fdcf16bb60 Merge branch 'master' into update/15563 ... # Conflicts: # assets/css/admin-rtl.css # assets/css/admin.css # assets/css/helper-rtl.css # assets/css/helper.css # assets/css/wc-setup-rtl.css # assets/css/wc-setup.css # assets/css/woocommerce-rtl.css # assets/css/woocommerce.css		2017-07-12 16:18:13 +01:00
..
css	Merge branch 'master' into update/15563	2017-07-12 16:18:13 +01:00
fonts	Fixed file permissions	2017-01-17 16:31:31 -02:00
images	Update WooCommerce Services copy (#15598)	2017-06-14 11:24:45 +01:00
js	Merge pull request #16058 from woocommerce/update/selectwoo	2017-07-10 19:24:54 -03:00