Changeset [6360444acfd6bd384edd216d0217a1baa30ef83a] by dleffler
February 11th, 2013 @ 09:48 PM
Merge branch 'develop' into feature/container2
Conflicts:
CHANGELOG.md
https://github.com/exponentcms/exponent-cms/commit/6360444acfd6bd38...
Committed by dleffler
- A install/changes/2.1.2.txt
- M CHANGELOG.md
- M external/ExtPrograms.csv
- M framework/core/subsystems/forms/controls/assets/files/attachable-files.css
- M framework/core/subsystems/forms/controls/filemanagercontrol.php
- M framework/modules/administration/views/administration/mass_mail.tpl
- M framework/modules/administration/views/administration/toolbar.tpl
- M framework/modules/events/controllers/eventController.php
- M framework/modules/events/views/event/showall_Upcoming Events.tpl
- M framework/modules/file/controllers/fileController.php
- M framework/modules/file/models/expFile.php
- M framework/modules/photoalbum/controllers/photosController.php
- M framework/modules/photoalbum/views/photo/multi_add.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