Changeset [480055d3b5004bf0b17b4b5b66bda9d5c1cb91df] by dleffler
June 5th, 2012 @ 01:29 PM
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
framework/modules/ecommerce/controllers/eventregistrationController.php
https://github.com/exponentcms/exponent-cms/commit/480055d3b5004bf0...
Committed by dleffler
- M framework/modules/ecommerce/controllers/cartController.php
- M framework/modules/ecommerce/controllers/eventregistrationController.php
- M framework/modules/ecommerce/controllers/storeController.php
- M framework/modules/ecommerce/products/models/eventregistration.php
- M framework/modules/ecommerce/products/views/eventregistration/edit.tpl
- M framework/modules/ecommerce/products/views/eventregistration/show.tpl
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS