Changeset [87ab1b0995fa9c6ef6ecaaecd9d2926f058fde36] by dleffler
Revision 87ab1b0995fa9c6ef6ecaaecd9d2926f058fde36,
committed by dleffler
· June 24th, 2016 @ 06:48 PM
Merge branch 'develop'
https://github.com/exponentcms/exponent-cms/commit/87ab1b0995fa9c6e...
19 changed files
-
A
external/ie10-viewport-bug-workaround.css -
A
external/ie10-viewport-bug-workaround.js -
M
external/ExtPrograms.csv -
M
external/jquery/addons/css/owl.carousel.css -
M
external/jquery/addons/css/owl.theme.default.css -
M
external/jquery/addons/css/owl.theme.green.css -
M
external/jquery/addons/js/bootstrap-dialog.js -
M
external/jquery/addons/js/owl.carousel.js -
M
framework/core/expFramework.php -
M
framework/core/forms/controls/bootstrap3/datetimecontrol.php -
M
framework/core/forms/controls/newui/datetimecontrol.php -
M
framework/core/subsystems/expDateTime.php -
M
framework/core/subsystems/expTheme.php -
M
framework/modules/core/controllers/expHTMLEditorController.php -
M
framework/modules/file/views/file/elfinder.tpl -
M
framework/modules/file/views/file/uploader.tpl -
M
framework/modules/forms/controllers/formsController.php -
M
framework/modules/twitter/controllers/twitterController.php -
M
install/upgrades/fix_help_sefurls.php