Skip to content
Commit 2cf5d1bc authored by djcha's avatar djcha
Browse files

Merge branch '20210730' of forge.etsi.org:qkd/gs018-orch-int-sdn into 20210730 

# Conflicts:
#	etsi-qkd-sdn-connectivity@2021-07-30.yang
#	etsi-qkd-sdn-topology@2021-07-30.yang
parents 0e0482f7 c0ac9e78
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment