tree 56447d71eb8cf91b24751e61e8d68a645f14f51c
parent 06fc3307904bcbb234e79606f615db92c6dd4d8d
parent c6bbec60f890a55c3ac0b84ea1add8ece20df575
author Jan Høydahl <jan.git@cominvent.com> 1614786198 +0100
committer Jan Høydahl <jan.git@cominvent.com> 1614786198 +0100

Merge branch 'master' into main/lucene

# Conflicts:
#	content/pages/solr/downloads.md