Commit 76e728b0 authored by Guillaume Beraudo's avatar Guillaume Beraudo

Merge branch 'zrtp' of git.linphone.org:ortp-private into zrtp

parents a5b61d2b 1921fd17
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment