-
Tristan Matthews authored
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into hold_secured_call Resolved Conflicts: daemon/src/audio/audiortp/audio_rtp_factory.cpp
c2a052bc
Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into hold_secured_call Resolved Conflicts: daemon/src/audio/audiortp/audio_rtp_factory.cpp