Merge branch 'main' into fix/DEF-752-another-combination

coveo · May 2, 2023 · 54aec15 · 54aec15
2 parents 8e8cd59 + 6ac3c13
commit 54aec15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/private-distributed.yml b/private-distributed.yml
@@ -9,6 +9,7 @@ allow-licenses:
   - 'BSD-2-Clause'
   - 'BSD-2-Clause-Patent'
   - 'BSD-2-Clause-Views'
+  - 'BSD-2-Clause AND MIT'
   - 'BSD-3-Clause'
   - 'BSD-3-Clause-Attribution'
   - 'BSD-3-Clause-Clear'

diff --git a/private-undistributed.yml b/private-undistributed.yml
@@ -4,6 +4,7 @@ allow-licenses:
   - 'AFL-2.1'
   - 'AFL-3.0'
   - 'Apache-2.0'
+  - 'Apache-2.0 AND BSD-3-Clause AND MIT AND OFL-1.1'
   - 'Apache-2.0 AND BSD-3-Clause AND Python-2.0'
   - 'APL-1.0'
   - 'Artistic-2.0'
@@ -14,6 +15,7 @@ allow-licenses:
   - 'BSD-2-Clause-Patent'
   - 'BSD-2-Clause-Views'
   - 'BSD-2-Clause AND BSD-3-Clause'
+  - 'BSD-2-Clause AND MIT'
   - 'BSD-3-Clause'
   - 'BSD-3-Clause-Attribution'
   - 'BSD-3-Clause-Clear'

diff --git a/public.yml b/public.yml
@@ -9,6 +9,7 @@ allow-licenses:
   - 'BSD-2-Clause'
   - 'BSD-2-Clause-Patent'
   - 'BSD-2-Clause-Views'
+  - 'BSD-2-Clause AND MIT'
   - 'BSD-3-Clause'
   - 'BSD-3-Clause-Attribution'
   - 'BSD-3-Clause-Clear'