Merge branch 'master' into bellesip
Conflicts: submodules/linphone
This commit is contained in:
commit
e6f7074a2c
1 changed files with 1 additions and 1 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 82a7a9f7f596488d1df6e18489eea15818e9fa51
|
Subproject commit 644008c6295236c9bb2dd2a1e443f616afca7967
|
Loading…
Reference in a new issue