Changeset [685ee5b1c48fd5635dec33e98af52644187e2612] by dleffler
Revision 685ee5b1c48fd5635dec33e98af52644187e2612,
committed by dleffler
· June 17th, 2016 @ 11:52 AM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/685ee5b1c48fd563...
14 changed files
-
M
external/ExtPrograms.csv -
M
framework/core/forms/controls/bootstrap3/ckeditorcontrol.php -
M
framework/core/forms/controls/ckeditorcontrol.php -
M
framework/core/forms/fakeform.php -
M
framework/modules/file/connector/elfinder.php -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/forms/views/forms/design_form.bootstrap3.tpl -
M
framework/modules/navigation/assets/css/depth.css -
M
framework/modules/navigation/views/navigation/showall_Collapsing Hierarchy.tpl -
M
framework/modules/navigation/views/navigation/showall_Top Down Collapsing.tpl -
M
framework/modules/news/controllers/newsController.php -
M
framework/modules/text/views/text/showall_inline.bootstrap.tpl -
M
framework/modules/text/views/text/showall_inline.bootstrap3.tpl -
M
framework/modules/text/views/text/showall_inline.tpl