diff options
| author | mo khan <mo.khan@gmail.com> | 2020-05-27 14:59:20 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-05-27 14:59:20 +0000 |
| commit | 5b4aca6e3c936bca2657d1ad1a8f336838fda4bb (patch) | |
| tree | 2a5ba8dfc9bdb61c58633373be122ae2f83df1e7 /normalized-licenses.yml | |
| parent | bff873a938de126d2b79e799df325f3d5c31295b (diff) | |
| parent | 80fa34dd2bd72af88efcb85844302d04450a0e1e (diff) | |
Merge branch '212919-conan-integration-tests' into 'master'v3.10.0
Scan conan projects
See merge request gitlab-org/security-products/license-management!156
Diffstat (limited to 'normalized-licenses.yml')
| -rw-r--r-- | normalized-licenses.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/normalized-licenses.yml b/normalized-licenses.yml index 429aaee..28bc1c4 100644 --- a/normalized-licenses.yml +++ b/normalized-licenses.yml @@ -6,6 +6,7 @@ ids: Apache2: Apache-2.0 Apache License v2.0: Apache-2.0 ASL, version 2: Apache-2.0 + BSD 3-Clause: BSD-3-Clause BSD (3 clause): BSD-3-Clause BSD: BSD-4-Clause BSD-derived (http://www.repoze.org/LICENSE.txt): BSD-2-Clause |