css
d
Merge branch 'master' of https://github.com/cosmocommerce/magento-onepagecheckout into cosmocommerce
merge version 2.1.12
Merge branch 'master' of https://github.com/cosmocommerce/magento-onepagecheckout into cosmocommerce

Conflicts:
	frontend/template/onepagecheckout/onepage/billing.phtml