Changeset [e39243f21180d21b7178f859b27d9d37426268ea] by Fred Dirkse - OIC Group, Inc
Revision e39243f21180d21b7178f859b27d9d37426268ea,
committed by Fred Dirkse - OIC Group, Inc
· June 21st, 2011 @ 06:34 PM
Merge branch 'develop' of ssh://git@github.com/exponentcms/exponent-cms
into develop
https://github.com/exponentcms/exponent-cms/commit/e39243f21180d21b...
12 changed files
-
R
framework/modules/administration/menus/order_quickfinder.php -
M
framework/core/database/definitions/content_expFiles.php -
M
framework/core/database/definitions/content_expTags.php -
M
framework/core/subsystems/expPaginator.php -
M
framework/modules/addressbook/views/address/edit.tpl -
M
framework/modules/administration/assets/css/slingbar.css -
M
framework/modules/administration/menus/ecomm.php -
M
framework/modules/ecommerce/assets/css/invoice.css -
M
framework/modules/ecommerce/controllers/orderController.php -
M
framework/modules/ecommerce/views/order/invoice.tpl -
M
framework/modules/search/views/search/spider.tpl -
M
install/index.php