Changeset [ce6bee6a7d91282bf6d881fc4bb047f844a6f358] by Phillip Ball
Revision ce6bee6a7d91282bf6d881fc4bb047f844a6f358,
committed by Phillip Ball
· July 15th, 2011 @ 03:28 PM
Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/ce6bee6a7d91282b...
18 changed files
-
A
conf/extensions/minify.structure.php -
A
subsystems/lang/eng_US/conf/extensions/minify.structure.php -
M
conf/extensions/minify.defaults.php -
M
framework/core/subsystems/expCSS.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/modules/administration/views/administration/configure_site.tpl -
M
framework/modules/ecommerce/assets/css/invoice.css -
M
framework/modules/ecommerce/controllers/orderController.php -
M
framework/modules/ecommerce/views/order/create_new_order.tpl -
M
framework/modules/migration/controllers/migrationController.php -
M
framework/modules/migration/views/migration/configure.tpl -
M
framework/modules/report/controllers/reportController.php -
M
install/pages/install-6.php -
M
install/pages/install-7.php -
M
install/pages/upgrade-2.php -
M
install/upgrades/fix_database.php -
M
subsystems/config/load.php -
M
subsystems/lang/eng_US/install/pages/admin_user.php