Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts: submodules/linphone
This commit is contained in:
commit
f828243898
1 changed files with 1 additions and 1 deletions
|
@ -1 +1 @@
|
|||
Subproject commit c25ec2d635ea4c603f478d0afd55822699542294
|
||||
Subproject commit e6157a4cf1c92764b9d1aa6246e6987b604f1a85
|
Loading…
Reference in a new issue