Merge branch 'jetpack_infinite_scroll_wc_products_fixes' of github.com:Automattic/themes into jetpack_infinite_scroll_wc_products_fixes
* 'jetpack_infinite_scroll_wc_products_fixes' of github.com:Automattic/themes: Shoreditch: Fixes Jetpack Infinite Scroll WC issues. Closes #24 Lodestar: Fixes Jetpack Infinite Scroll WC issues. Closes #23 Button 2: Fixes Jetpack Infinite Scroll WC issues. Pique: Fixes Jetpack Infinite Scroll WC issues. Karuna: adds correct WC filters on return functions. Libre 2: Revert CSS fix as the Jetpack fix is in core files now. Libre 2: Fixes Jetpack Infinite Scroll WC issues. Dara: Fixes Jetpack Infinite Scroll WC issues. Closes #10 Dyad 2: Fixes Jetpack Infinite Scroll WC issues. Independent Publisher 2: Fixes Jetpack Infinite Scroll WC issues. Radcliffe 2: Fixes Jetpack Infinite Scroll WC issues. # Conflicts: # dara/inc/woocommerce.php # dyad-2/inc/woocommerce.php # independent-publisher-2/inc/woocommerce.php # karuna/inc/woocommerce.php # libre-2/inc/woocommerce.php # lodestar/inc/woocommerce.php # pique/inc/woocommerce.php # radcliffe-2/inc/woocommerce.php
This commit is contained in:
commit
5aa25a94d6