Changeset [2556737d7d177ecf8b0f6ee0c31ff887f0a00b95] by Phillip Ball
Revision 2556737d7d177ecf8b0f6ee0c31ff887f0a00b95,
committed by Phillip Ball
· July 14th, 2011 @ 07:32 PM
Merge remote branch 'origin/develop' into develop
https://github.com/exponentcms/exponent-cms/commit/2556737d7d177ecf...
29 changed files
-
M
CHANGELOG -
M
compat.php -
M
conf/extensions/antispam.defaults.php -
M
conf/extensions/comments.defaults.php -
M
conf/extensions/display.defaults.php -
M
conf/extensions/ldap.defaults.php -
M
conf/extensions/maint.defaults.php -
M
conf/extensions/minify.defaults.php -
M
conf/extensions/registration.defaults.php -
M
conf/extensions/search.defaults.php -
M
conf/extensions/simplenotes.defaults.php -
M
conf/extensions/site.defaults.php -
M
conf/extensions/tracking.defaults.php -
M
exponent.php -
M
exponent_bootstrap.php -
M
exponent_common.php -
M
exponent_constants.php -
M
exponent_variables.php -
M
exponent_version.php -
M
framework/core/controllers/expController.php -
M
framework/datatypes/billingcalculator.php -
M
framework/datatypes/ecomconfig.php -
M
framework/modules/ecommerce/billingcalculators/paypalExpressCheckout.php -
M
framework/modules/ecommerce/controllers/cartController.php -
M
framework/modules/ecommerce/views/cart/configure.tpl -
M
index.php -
M
overrides.php -
M
subsystems/config/load.php -
M
thumb.php