You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/09/10 20:09:38 UTC

[shiro-site] branch main updated (92663a8 -> 70c06a6)

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

bmarwell pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/shiro-site.git.


    from 92663a8  Merge pull request #77 from pitjazz/SHIRO-261
     add f66e717  Merge features and features-overview pages
     new 70c06a6  Merge pull request #88 from apache/merge-feature-pages

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .htaccess            |  1 +
 features-overview.md | 35 -----------------------------------
 features.md          | 12 ++++++------
 sitemap.xml          |  3 ---
 4 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 features-overview.md

[shiro-site] 01/01: Merge pull request #88 from apache/merge-feature-pages

Posted by bm...@apache.org.
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 70c06a681107c0f54e8bf78f6eba0b6adf261001
Merge: 92663a8 f66e717
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Fri Sep 10 22:09:33 2021 +0200

    Merge pull request #88 from apache/merge-feature-pages
    
    Merge features and features-overview pages

 .htaccess            |  1 +
 features-overview.md | 35 -----------------------------------
 features.md          | 12 ++++++------
 sitemap.xml          |  3 ---
 4 files changed, 7 insertions(+), 44 deletions(-)