Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42
Conflicts: cmake_targets/CMakeLists.txt docker/Dockerfile.enb.rhel7.oc4-4 openair1/SCHED_NR_UE/pucch_uci_ue_nr.c openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
Showing
.dockerignore
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
openshift/README.md
0 → 100644
Please register or sign in to comment