Merge branch 'master' of git.linphone.org:linphone-android
Conflicts: submodules/linphone
This commit is contained in:
commit
6366fac197
1 changed files with 1 additions and 1 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit 776d58673a12ceb309ad0e0dc50857b82e3a5d87
|
Subproject commit 73acd25082b213ba0ce6cd77cecd736b34b4bdc2
|
Loading…
Reference in a new issue