Merge branch 'master' into bellesip
Conflicts: submodules/linphone
This commit is contained in:
commit
57a9defc31
1 changed files with 1 additions and 1 deletions
|
@ -1 +1 @@
|
|||
Subproject commit 75e340883704bd3aa55477567c37aade1e7bba3d
|
||||
Subproject commit 63fa87209c21d65133d24551c7e92a7ac39059a3
|
Loading…
Reference in a new issue