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/03 15:55:26 UTC

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

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

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

commit 6d97193776f9c5d4f1d5079a36687e56847f1205
Merge: 06fc330 c6bbec6
Author: Jan Høydahl <ja...@cominvent.com>
AuthorDate: Wed Mar 3 16:43:18 2021 +0100

    Merge branch 'master' into main/lucene
    
    # Conflicts:
    #	content/pages/solr/downloads.md

 content/pages/solr/downloads.md                    |  0
 .../solr/solr_news/2021-02-22-8-8-1-available.md   | 27 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --cc content/pages/solr/downloads.md
index 0000000,e0d6a67..e69de29
mode 000000,100644..100644
--- a/content/pages/solr/downloads.md
+++ b/content/pages/solr/downloads.md