Mike Jolley aacb01d1e7 Merge branch 'pr/13503' ... # Conflicts: # assets/css/twenty-seventeen.css # assets/css/woocommerce-layout.css # assets/css/woocommerce-layout.scss # assets/css/woocommerce.css		2017-04-27 12:46:05 +01:00
..
theme-woocommerce	…
hook-docs.php	…