diff options
author | Borivoje Tasovac <btasovac@gitlab.com> | 2020-08-31 17:15:47 +0300 |
---|---|---|
committer | Borivoje Tasovac <btasovac@gitlab.com> | 2020-08-31 17:15:47 +0300 |
commit | ffc27ec2092b611357bd3d4606ebb190674af328 (patch) | |
tree | 2fba6be6456c54ffed99623cb74cb3f9337a551f | |
parent | f3facbdeaf5d3f2eb9ec959c0cba1dd6bebf96f5 (diff) | |
parent | 03691b74ece6b3b63872244cf7183d18a698ebb4 (diff) |
Merge branch 'master' into 'master'
Request for ETSI OSM license in oss_projects.yml
See merge request gitlab-com/marketing/community-relations/gitlab-oss!630
-rw-r--r-- | data/oss_projects.yml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/data/oss_projects.yml b/data/oss_projects.yml index a6d2999..54c9613 100644 --- a/data/oss_projects.yml +++ b/data/oss_projects.yml @@ -2504,4 +2504,9 @@ project_name: 'VDR Fritz' project_description: 'A plugin for video disc recorder to signal calls incoming and outgoing on AVMs Fritz!Boxes.' project_url: 'https://joachim-wilke.de/projects/' - gitlab_plan: Ultimate
\ No newline at end of file + gitlab_plan: Ultimate +- + project_name: 'ETSI OSM' + project_description: "An ETSI-hosted project to develop an Open Source NFV Management and Orchestration (MANO) software stack aligned with ETSI NFV." + project_url: 'https://osm.etsi.org/' + gitlab_plan: Ultimate |