Commit 31fbc805 authored by Bilel's avatar Bilel

Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop1B

parent a6742020 - Commit 1fa2f76e

Conflicts:
	targets/RT/USER/lte-softmodem.c
parents 5bdfa812 1fa2f76e