Changeset [87ce25b305940b4b8ca5eabdc25ed4f98a1cae9e] by Phillip Ball
Revision 87ce25b305940b4b8ca5eabdc25ed4f98a1cae9e,
committed by Phillip Ball
· June 16th, 2011 @ 09:10 PM
Merge remote branch 'origin/develop' into develop
Conflicts:
framework/modules/ecommerce/views/store/showall.tpl
https://github.com/exponentcms/exponent-cms/commit/87ce25b305940b4b...
5 changed files
-
A
framework/modules/ecommerce/shippingcalculators/icons/default.png -
R
framework/modules/ecommerce/shippingcalculators/icons/default.gif -
M
framework/datatypes/shippingcalculator.php -
M
framework/modules/ecommerce/shippingcalculators/tablebasedcalculator.php -
M
framework/modules/ecommerce/views/store/showall.tpl