This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch SLING-7858 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 9299915dab93f9369409dcf8811577db7787bd34 Merge: ac140a5 f96ea78 Author: Dan Klco <[email protected]> AuthorDate: Wed Sep 5 10:14:46 2018 -0400 Merge branch 'SLING-7858' of github.com:apache/sling-org-apache-sling-app-cms into SLING-7858 ui/src/main/frontend/src/js/cms.js | 9 ++++ .../components/editor/fields/file/field.jsp | 48 ++++++++++++++++------ 2 files changed, 45 insertions(+), 12 deletions(-)
