Merge branch 'develop-nr' into 'nr_mib_fix'
# Conflicts: # targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
This diff is collapsed.
This diff is collapsed.
# Conflicts: # targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf