Commit 138d1c8e authored by Jerome PERALDI's avatar Jerome PERALDI

Merge branch '6.1.2.3-Integration-Branch' into 'private/6.1.2.3-Integration-Branch_REBASED'

# Conflicts:
#   FirecellRD/components/RAN/cmake_targets/CMakeLists.txt
#   FirecellRD/components/RAN/openair1/SCHED_NR/fapi_nr_l1.c
#   Multi-Ue-Proxy/src/nfapi_pnf.c
parents 509a78b5 42220073
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