Skip to content
Snippets Groups Projects
Commit e2254984 authored by knopp's avatar knopp
Browse files

Merge branch 'RU-RAU-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into RU-RAU-split

Conflicts:
	openair2/ENB_APP/enb_config.c
parents 6aa0ff09 ad98f5aa
No related branches found
No related tags found
4 merge requests!650Release v1.1.0 Candidate,!588Develop nr merge,!504Develop integration 2019 w06,!451Enhancement LTE-M
Showing
with 5524 additions and 4611 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment