Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios into mac-video-calls-temp

# Conflicts:
#	submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h
#	submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
This commit is contained in:
overtake 2020-08-24 13:26:29 +03:00
commit 287e37850c
62 changed files with 3136 additions and 3021 deletions

View file

@ -1 +1 @@
2.2.0
3.4.1