Changeset [db23b07d616cec16400ac32f175a56aecb9b2931] by dleffler
April 15th, 2014 @ 08:49 PM
Merge branch 'develop' into bootstrap3dave
Conflicts:
framework/core/subsystems/expCSS.php
framework/core/subsystems/expJavascript.php
https://github.com/exponentcms/exponent-cms/commit/db23b07d616cec16...
Committed by dleffler
- M CHANGELOG.md
- M external/ExtPrograms.csv
- M external/jquery/addons/js/jquery.colorbox.js
- M framework/core/forms/controls/autocompletecontrol.php
- M framework/core/forms/controls/bootstrap/filemanagercontrol.php
- M framework/core/forms/controls/filemanagercontrol.php
- M framework/core/index.php
- M framework/core/subsystems/expCSS.php
- M framework/core/subsystems/expJavascript.php
- M framework/core/subsystems/expPaginator.php
- M framework/core/subsystems/expTheme.php
- M framework/modules/file/connector/links.js
- M framework/modules/notfound/controllers/notfoundController.php
- M framework/modules/search/controllers/searchController.php
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.tpl
- M framework/plugins/function.getchromemenu.php
- M install/changes/2.3.0.txt
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