Mike Jolley 128b826791 Merge branch 'master' into tweak/order-screens ... # Conflicts: # assets/css/admin-rtl.css # assets/css/admin.css # includes/admin/class-wc-admin-post-types.php		2017-11-15 13:36:13 +00:00
..
css	Merge branch 'master' into tweak/order-screens	2017-11-15 13:36:13 +00:00
fonts	Fixed file permissions	2017-01-17 16:31:31 -02:00
images	new placeholder image	2017-11-14 12:50:40 -07:00
js	Merge branch 'master' into tweak/order-screens	2017-11-15 13:36:13 +00:00