Changeset [2644101c2d2157950148a865d2a622865f831448] by Phillip Ball
Revision 2644101c2d2157950148a865d2a622865f831448,
committed by Phillip Ball
· June 20th, 2011 @ 09:05 PM
Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/2644101c2d215795...
10 changed files
-
A
framework/modules/addressbook/views/address/manage.tpl -
M
framework/core/database/definitions/geo_country.php -
M
framework/core/database/definitions/geo_region.php -
M
framework/modules/addressbook/controllers/addressController.php -
M
framework/modules/addressbook/views/address/edit.tpl -
M
framework/modules/administration/menus/ecomm.php -
M
framework/modules/ecommerce/controllers/ecomconfigController.php -
M
framework/modules/ecommerce/views/ecomconfig/configure.tpl -
M
plugins/function.control.php -
M
subsystems/database/mysqli.php