Changeset [57b5f133f0868b69000a6cb7dd83ecde5bbe3189] by dleffler
January 7th, 2014 @ 01:57 AM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/forms/controllertemplate.php
framework/core/forms/controls/bootstrap/buttongroupcontrol.php
framework/core/forms/form.php
framework/core/subsystems/expJavascript.php
framework/modules/forms/controllers/formsController.php
https://github.com/exponentcms/exponent-cms/commit/57b5f133f0868b69...
Committed by dleffler
- M framework/core/forms/controllertemplate.php
- M framework/core/forms/controls/buttongroupcontrol.php
- M framework/modules/flickrfeed/views/flickrfeed/configure/rss_pull.tpl
- M framework/plugins/block.toggle.php
- M framework/plugins/function.ddrerank.php
- M framework/plugins/function.rating.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