Skip to content
Commit 06209943 authored by sunse's avatar sunse
Browse files

Merge branch 'Integration_Rel17_SA5_140_YAML' into... 

Merge branch 'Integration_Rel17_SA5_140_YAML' into '28.541_Rel17_CR0630_Stage3_update_for_UPF_and_PCF'

# Conflicts: with manual resolution: keep both
#   OpenAPI/5gcNrm.yaml
parents 87f32d12 d0867d80
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment