This is an automated email from the ASF dual-hosted git repository. bmarwell pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/shiro-site.git
commit 860153ac8792dd89cd248e1cc3cd07405c1d013e Merge: 70c06a6 76aaccf Author: Benjamin Marwell <[email protected]> AuthorDate: Fri Sep 10 22:16:17 2021 +0200 Merge pull request #90 from apache/merge-feature-pages Merge feature pages .htaccess | 3 ++- contribute.md | 18 ------------------ navigation.md | 2 +- sitemap.xml | 3 --- 4 files changed, 3 insertions(+), 23 deletions(-)
