function.php
Merge branch 'master' of https://github.com/Tucsky/Bootstrap

Conflicts:
	functions.php
	woocommerce/content-product.php