mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-20 20:48:07 +00:00
Merge branch 'master' into wip_video_ui_improvements
Conflicts: submodules/externals/exosip
This commit is contained in:
commit
67de7391bd
3 changed files with 3 additions and 3 deletions
2
submodules/externals/exosip
vendored
2
submodules/externals/exosip
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit 8483ca292c10e4bca3331040dd9babf8431d0393
|
||||
Subproject commit 014f5a021ad4a0c024088edbb721f144a6f96699
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 30eca09f41d40af19a67e64912a35bf1e313cd30
|
||||
Subproject commit 2111e92a393cd0cbf3934ea1de406904f0d34bca
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 498a7c526192392e402e72b7e9f2c6c381bdb7fd
|
||||
Subproject commit 391b6d6b0fdf6854e5a25f287c4d8461730a1d40
|
||||
Loading…
Add table
Reference in a new issue