Changeset [f76f2d136501e2e5b4b5609c1253a49a744ea2f9] by dleffler
February 15th, 2013 @ 09:30 PM
Merge branch 'develop' into feature/container2
Conflicts:
CHANGELOG.md exponent_version.php install/samples/sample.eql
https://github.com/exponentcms/exponent-cms/commit/f76f2d136501e2e5...
Committed by dleffler
- A install/changes/2.1.3.txt
- M CHANGELOG.md
- M framework/core/lang/Cestina.php
- M framework/core/lang/Dansk.php
- M framework/core/lang/Deutsch.php
- M framework/core/lang/English - US.php
- M framework/core/lang/Espanol.php
- M framework/core/lang/Francais.php
- M framework/core/lang/Norsk.php
- M framework/core/lang/Suomi.php
- M framework/modules/forms/views/forms/configure/form.tpl
- M framework/modules/forms/views/forms/design_form.tpl
- M install/changes/2.1.2.txt
- M install/upgrades/remove_oldfiles.php
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