diff options
| author | Tetiana Chupryna <tchupryna@gitlab.com> | 2019-10-24 13:38:32 +0000 |
|---|---|---|
| committer | Tetiana Chupryna <tchupryna@gitlab.com> | 2019-10-24 13:38:32 +0000 |
| commit | ed6d15ee8d8167f94b7ca03f26526c7ab29aab02 (patch) | |
| tree | 04fe5855bbd079a399f8fc2ccdf148c54bf1b024 /normalized-licenses.yml | |
| parent | 1fd208bf51631029e89daf88600fdd62224c7207 (diff) | |
| parent | cdfa8116a4c7d0c7659ed98aee289b489646c658 (diff) | |
Merge branch '12651-dotnet-2.2+3.0' into 'master'v1.7.4
Install .NET Core 2.2 and .NET Core 3.0
See merge request gitlab-org/security-products/license-management!70
Diffstat (limited to 'normalized-licenses.yml')
| -rw-r--r-- | normalized-licenses.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/normalized-licenses.yml b/normalized-licenses.yml index 3bfed18..0c8635d 100644 --- a/normalized-licenses.yml +++ b/normalized-licenses.yml @@ -5,8 +5,10 @@ ids: Apache2: Apache-2.0 ASL, version 2: Apache-2.0 BSD: BSD-4-Clause + BSD style: BSD-3-Clause CC0 1.0 Universal: CC0-1.0 CC01: CC0-1.0 + Common Public License Version 1.0: CPL-1.0 EPL1: EPL-1.0 GPLv2: GPL-2.0 GPLv3: GPL-3.0 @@ -30,4 +32,3 @@ ids: ruby: Ruby Simplified BSD: BSD-2-Clause SimplifiedBSD: BSD-2-Clause - unknown: unknown |