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

Posted to commits@lucene.apache.org by ja...@apache.org on 2021/03/10 13:00:28 UTC

[lucene-site] 01/01: Merge branch 'main' into production

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

janhoy pushed a commit to branch production
in repository https://gitbox.apache.org/repos/asf/lucene-site.git

commit c06506539a04c82da05260739ec26e5ace68c03e
Merge: 0ded504 d22d15d
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Mar 10 13:59:39 2021 +0100

    Merge branch 'main' into production
    
    # Conflicts:
    #	.asf.yaml

 README.md                                 | 9 +++++----
 build.sh                                  | 6 +++---
 content/pages/site-instructions.md        | 2 +-
 themes/lucene/templates/htaccess.template | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)