Commit pendiente
commit pendiente
pendientes commit
Merge branch 'master' of github.com:alvarotarquiola/tienda

Conflicts:
	tools/smarty/compile/%%00^00F^00FE0D33%%pagination.tpl.php
	tools/smarty/compile/%%04^04D^04DF211F%%blocksearch-top.tpl.php
	tools/smarty/compile/%%06^065^065AA61D%%index.tpl.php
	tools/smarty/compile/%%06^06B^06BE3F28%%blockcategories.tpl.php
	tools/smarty/compile/%%07^079^07996913%%errors.tpl.php
	tools/smarty/compile/%%0F^0FE^0FEA4B44%%breadcrumb.tpl.php
	tools/smarty/compile/%%20^207^207BEC46%%order-steps.tpl.php
	tools/smarty/compile/%%25^25F^25FD9CDA%%blockinfos.tpl.php
	tools/smarty/compile/%%36^364^36457208%%blockspecials.tpl.php
	tools/smarty/compile/%%3C^3C7^3C75544C%%blockcart.tpl.php
	tools/smarty/compile/%%3E^3E8^3E8DF42D%%blocknewproducts.tpl.php
	tools/smarty/compile/%%3F^3FA^3FAA2EFB%%blocklanguages.tpl.php
	tools/smarty/compile/%%53^534^534D0F64%%category.tpl.php
	tools/smarty/compile/%%71^715^715BCDD0%%blockuserinfo.tpl.php
	tools/smarty/compile/%%71^716^71632D7A%%header.tpl.php
	tools/smarty/compile/%%73^73C^73CC3179%%blockmanufacturer.tpl.php
	tools/smarty/compile/%%7E^7E0^7E0BE683%%header.tpl.php
	tools/smarty/compile/%%87^876^876BFB23%%blockcart-json.tpl.php
	tools/smarty/compile/%%88^88D^88D019AB%%footer.tpl.php
	tools/smarty/compile/%%AB^AB8^AB8959D0%%category-tree-branch.tpl.php
	tools/smarty/compile/%%B9^B9B^B9BFF047%%blockpermanentlinks-header.tpl.php
	tools/smarty/compile/%%BB^BB2^BB2C22DD%%authentication.tpl.php
	tools/smarty/compile/%%D3^D3C^D3C5316F%%editorial.tpl.php
	tools/smarty/compile/%%E5^E51^E515DE52%%product-list.tpl.php
	tools/smarty/compile/%%E8^E80^E8021B4A%%product-sort.tpl.php
	tools/smarty/compile/%%F0^F0D^F0DBE9CD%%blockbestsellers.tpl.php
commit
commit
Merge branch 'master' of github.com:alvarotarquiola/tienda

Conflicts:
	tools/smarty/compile/%%00^00F^00FE0D33%%pagination.tpl.php
	tools/smarty/compile/%%04^04D^04DF211F%%blocksearch-top.tpl.php
	tools/smarty/compile/%%06^065^065AA61D%%index.tpl.php
	tools/smarty/compile/%%06^06B^06BE3F28%%blockcategories.tpl.php
	tools/smarty/compile/%%07^079^07996913%%errors.tpl.php
	tools/smarty/compile/%%0F^0FE^0FEA4B44%%breadcrumb.tpl.php
	tools/smarty/compile/%%20^207^207BEC46%%order-steps.tpl.php
	tools/smarty/compile/%%25^25F^25FD9CDA%%blockinfos.tpl.php
	tools/smarty/compile/%%36^364^36457208%%blockspecials.tpl.php
	tools/smarty/compile/%%3C^3C7^3C75544C%%blockcart.tpl.php
	tools/smarty/compile/%%3E^3E8^3E8DF42D%%blocknewproducts.tpl.php
	tools/smarty/compile/%%3F^3FA^3FAA2EFB%%blocklanguages.tpl.php
	tools/smarty/compile/%%53^534^534D0F64%%category.tpl.php
	tools/smarty/compile/%%71^715^715BCDD0%%blockuserinfo.tpl.php
	tools/smarty/compile/%%71^716^71632D7A%%header.tpl.php
	tools/smarty/compile/%%73^73C^73CC3179%%blockmanufacturer.tpl.php
	tools/smarty/compile/%%7E^7E0^7E0BE683%%header.tpl.php
	tools/smarty/compile/%%87^876^876BFB23%%blockcart-json.tpl.php
	tools/smarty/compile/%%88^88D^88D019AB%%footer.tpl.php
	tools/smarty/compile/%%AB^AB8^AB8959D0%%category-tree-branch.tpl.php
	tools/smarty/compile/%%B9^B9B^B9BFF047%%blockpermanentlinks-header.tpl.php
	tools/smarty/compile/%%BB^BB2^BB2C22DD%%authentication.tpl.php
	tools/smarty/compile/%%D3^D3C^D3C5316F%%editorial.tpl.php
	tools/smarty/compile/%%E5^E51^E515DE52%%product-list.tpl.php
	tools/smarty/compile/%%E8^E80^E8021B4A%%product-sort.tpl.php
	tools/smarty/compile/%%F0^F0D^F0DBE9CD%%blockbestsellers.tpl.php