Changeset [57b4d9fda3d784ec7ba6dd6d560af23e56abf828] by dleffler

February 22nd, 2013 @ 08:40 PM

Merge branch 'develop' into feature/container2

Conflicts:
framework/core/subsystems/expCore.php framework/modules/users/controllers/usersController.php framework/modules/users/models/user.php https://github.com/exponentcms/exponent-cms/commit/57b4d9fda3d784ec...

Committed by dleffler

  • M CHANGELOG.md
  • M exponent_version.php
  • M framework/core/controllers/expController.php
  • M framework/modules/blog/views/blog/configure/aggregation.tpl
  • M framework/modules/events/views/event/month.tpl
  • M framework/modules/migration/controllers/migrationController.php
  • M framework/modules/users/models/group.php
  • M install/changes/2.1.3.txt
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