Commit bdc83aaa authored by masayuki.harada's avatar masayuki.harada

Merge remote-tracking branch 'remotes/origin/develop_SA_NGAP' into develop_SA_L3

# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair3/NGAP/ngap_gNB_nas_procedures.c
parents f00e5deb 079157eb
Markdown is supported
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