Skip to content
GitLab
Commit 5cba6a9a authored by Giacomo Bernini's avatar Giacomo Bernini
Browse files

Merge branch 'master' into '3.6.1-dev' 

# Conflicts:
#   Readme.md
parents e3415424 25626973
Pipeline #11924 passed with stage
in 0 seconds
Hide whitespace changes
Inline Side-by-side
Readme.md
View file @ 5cba6a9a
...@@ -8,6 +8,8 @@ The APIs described in this repository are defined for the following reference po ...@@ -8,6 +8,8 @@ The APIs described in this repository are defined for the following reference po
* `Or-Vnfm` * `Or-Vnfm`
* `Ve-vnfm` * `Ve-vnfm`
**IMPORTANT: In case of discrepancies the published ETSI Group Specification takes precedence.**
More information at [NFV Solutions wiki](https://nfvwiki.etsi.org/index.php?title=NFV_Solutions). More information at [NFV Solutions wiki](https://nfvwiki.etsi.org/index.php?title=NFV_Solutions).
## Content structure ## Content structure
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment