Merged branch '4.6' into main

alongosz · alongosz · commit 40426ecbfdc3 · 2025-12-09T23:33:28.000+01:00
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "ibexa/solr",
     "description": "Solr search engine implementation for Ibexa",
-    "license": "GPL-2.0-only",
+    "license": "(GPL-2.0-only or proprietary)",
     "type": "ibexa-bundle",
     "replace": {
         "ezsystems/ezplatform-solr-search-engine": "*"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ibexa/solr",`
`3`	`3`	`"description": "Solr search engine implementation for Ibexa",`
`4`		`- "license": "GPL-2.0-only",`
	`4`	`+ "license": "(GPL-2.0-only or proprietary)",`
`5`	`5`	`"type": "ibexa-bundle",`
`6`	`6`	`"replace": {`
`7`	`7`	`"ezsystems/ezplatform-solr-search-engine": "*"`