You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by dk...@apache.org on 2019/12/23 18:02:30 UTC

[sling-org-apache-sling-app-cms] 03/04: Merge branch 'master' into SLING-8947-grid-missing-fields

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch SLING-8947-grid-missing-fields
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 35842e660689961fc99d028f872c742eb5553f76
Merge: 3a94480 eac8c5e
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Dec 23 09:47:48 2019 -0500

    Merge branch 'master' into SLING-8947-grid-missing-fields

 builder/src/main/provisioning/cms.txt       | 39 +++++++++++++++--------------
 builder/src/main/provisioning/scripting.txt | 16 ++++++------
 builder/src/main/provisioning/sling.txt     | 17 +++++++------
 3 files changed, 37 insertions(+), 35 deletions(-)