mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-02-21 09:02:37 +00:00
Conflicts: src/include/switch_core_media.h src/mod/endpoints/mod_sofia/sofia_media.c src/switch_core_media.c
Conflicts: src/include/switch_core_media.h src/mod/endpoints/mod_sofia/sofia_media.c src/switch_core_media.c