Changeset [77d7e499db8d08f749cd1c841660a49503c0e252] by dleffler

March 18th, 2013 @ 08:01 PM

Merge branch 'develop' into feature/container2

Conflicts:
framework/modules/ecommerce/controllers/eventregistrationController.php https://github.com/exponentcms/exponent-cms/commit/77d7e499db8d08f7...

Committed by dleffler

  • M framework/core/expFramework.php
  • M framework/modules/administration/controllers/administrationController.php
  • M framework/modules/ecommerce/controllers/donationController.php
  • M framework/modules/ecommerce/controllers/eventregistrationController.php
  • M framework/modules/file/models/expFile.php
  • M framework/modules/motd/controllers/motdController.php
New-ticket 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

Shared Ticket Bins