Merge branch 'master' of https://github.com/opencart-extension/PagSeg… · opencart-extension/PagSeguro-Checkout-Transparente@0e7ae79 · GitHub

Commit

Merge branch 'master' of https://github.com/opencart-extension/PagSeg…

Browse files

…uro-Checkout-Transparente

# Conflicts:
#	README.md
#	upload/catalog/controller/extension/payment/pagseguro_boleto.php

Loading branch information

valdeir2000 committed Oct 5, 2016

2 parents d5b6138 + 788d25f commit 0e7ae79