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
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -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