Changeset [671bbc600729cc95e832cd08594aa74709bfddee] by dleffler
March 8th, 2014 @ 02:57 AM
Merge branch 'develop' into bs3newui
Conflicts:
framework/modules/text/views/text/showall_inline.tpl
https://github.com/exponentcms/exponent-cms/commit/671bbc600729cc95...
Committed by dleffler
- M exponent.js.php
- M external/ExtPrograms.csv
- M external/jquery/addons/js/jquery.colorbox.js
- M framework/modules/ecommerce/products/views/product/edit.tpl
- M framework/modules/text/controllers/textController.php
- M framework/modules/text/views/text/showall_inline.bootstrap.tpl
- M framework/modules/text/views/text/showall_inline.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