Changeset [458945e991c235569881fead11f96f2a4941d927] by dleffler

January 3rd, 2014 @ 01:31 AM

Merge branch 'develop' into bootstrap3dave

Conflicts:
framework/core/subsystems/expJavascript.php https://github.com/exponentcms/exponent-cms/commit/458945e991c23556...

Committed by dleffler

  • M framework/core/assets/less/forms-bootstrap.less
  • M framework/core/forms/controls/bootstrap/filemanagercontrol.php
  • M framework/core/forms/controls/filemanagercontrol.php
  • M framework/core/subsystems/expCSS.php
  • M framework/core/subsystems/expJavascript.php
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