Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
# Conflicts: # .gitignore
This commit is contained in:
commit
84a17115fa
221 changed files with 7564 additions and 2298 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -69,3 +69,4 @@ submodules/OpusBinding/SharedHeaders/*
|
|||
submodules/FFMpegBinding/SharedHeaders/*
|
||||
submodules/OpenSSLEncryptionProvider/SharedHeaders/*
|
||||
submodules/TelegramCore/FlatSerialization/Sources/*
|
||||
buildServer.json
|
||||
Loading…
Add table
Add a link
Reference in a new issue