This is an automated email from the ASF dual-hosted git repository. kwin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-site.git
commit 63f6ca35b4a79e61eae6a9b393d113708596335d Merge: 0125fd2 11e0a3f Author: Konrad Windszus <[email protected]> AuthorDate: Fri Jul 30 18:25:41 2021 +0200 Merge branch 'master' of [email protected]:apache/sling-site.git Conflicts: src/main/jbake/content/releases.md .asf.yaml | 3 ++ pom.xml | 5 ++++ src/main/jbake/assets/res/css/site.css | 7 +++++ src/main/jbake/assets/robots.txt | 4 +++ .../content/documentation/bundles/graphql-core.md | 6 ++-- .../content/documentation/bundles/scripting.md | 10 +++++++ .../bundles/scripting/scripting-htl.md | 22 ++++++++++++++ .../documentation/the-sling-engine/resources.md | 15 ++++++++++ src/main/jbake/content/index.md | 2 ++ src/main/jbake/content/news.md | 2 ++ src/main/jbake/content/releases.md | 1 + src/main/jbake/content/repolist.md | 6 ++++ src/main/jbake/content/sitemap.md | 2 +- src/main/jbake/jbake.properties | 11 +++++-- src/main/jbake/templates/downloads.tpl | 6 ++-- src/main/jbake/templates/edit-brick.tpl | 8 +++++ src/main/jbake/templates/htmlsitemap.tpl | 35 ++++++++++++++++++++++ src/main/jbake/templates/includes/Git.groovy | 5 +++- src/main/jbake/templates/layout/main.tpl | 1 + src/main/jbake/templates/menu.tpl | 2 +- src/main/jbake/templates/page.tpl | 3 ++ src/main/jbake/templates/repolist.tpl | 15 ++++++++-- src/main/jbake/templates/sitemap.tpl | 27 ++++++----------- 23 files changed, 166 insertions(+), 32 deletions(-) diff --cc src/main/jbake/content/releases.md index 860cda8,636d07c..4e51e78 --- a/src/main/jbake/content/releases.md +++ b/src/main/jbake/content/releases.md @@@ -8,7 -8,7 +8,8 @@@ This is a list of all our releases, ava ## July 2021 +* Parent and Bundle Parent 44 (30th) + * Feature Model 1.2.28, Feature Model Extension Api Regions 1.3.8, Slingfeature Maven Plugin 1.5.10 (29th) * Resource Resolver 1.7.10 (24th) * App CMS 1.0.4 (23rd) * Servlets Resolver 2.8.0 (22nd)
