-
Simon Morlat authored
Conflicts: include/flexisip/module-registrar.hh linphone-sdk src/conference/participant-devices-search.cc src/conference/participant-registration-subscription.cc
5bfe63a7
Conflicts: include/flexisip/module-registrar.hh linphone-sdk src/conference/participant-devices-search.cc src/conference/participant-registration-subscription.cc