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/solr-site.git

commit d15ee1420298a9f89baa7805352629b3459666f8
Merge: 1bff63c3d ec5cb0fcf
Author: Jan Høydahl <[email protected]>
AuthorDate: Wed Mar 18 02:27:09 2026 +0100

    Merge branch 'main' into production
    
    # Conflicts:
    #       themes/solr/templates/downloads.html

 content/pages/news.md                 |   2 +-
 content/pages/posts.md                |   4 ++
 pelicanconf.py                        |   6 +-
 plugins/combined_posts/__init__.py    | 110 ++++++++++++++++++++++++++++++++++
 themes/solr/static/css/base.css       |  58 +++++++++++++++++-
 themes/solr/static/javascript/main.js |   8 ++-
 themes/solr/templates/_header.html    |   5 +-
 themes/solr/templates/bloghome.html   |  10 +++-
 themes/solr/templates/downloads.html  |  29 +++++++++
 themes/solr/templates/news.html       |  12 +++-
 themes/solr/templates/posts.html      |  81 +++++++++++++++++++++++++
 themes/solr/templates/subnav.html     |   2 +
 12 files changed, 316 insertions(+), 11 deletions(-)

Reply via email to