Changeset [8a6e38102e244b9d2b21349930eb67c564b4cab7] by dleffler
March 13th, 2013 @ 03:06 AM
Merge branch 'develop' into feature/container2
Conflicts:
CHANGELOG.md exponent_version.php framework/core/forms/form.php
framework/core/subsystems/expSettings.php install/index.php
install/upgrades/upgrade_navigation.php
https://github.com/exponentcms/exponent-cms/commit/8a6e38102e244b9d...
Committed by dleffler
- M CHANGELOG.md
- M framework/core/subsystems/expVersion.php
- M framework/modules/events/controllers/eventController.php
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