Merge remote-tracking branch 'private/alpha' into cmake

This commit is contained in:
John Preston
2019-12-06 10:11:30 +03:00
291 changed files with 12837 additions and 10571 deletions

9
.gitmodules vendored
View File

@@ -55,3 +55,12 @@
[submodule "cmake"]
path = cmake
url = https://github.com/desktop-app/cmake_helpers.git
[submodule "Telegram/ThirdParty/expected"]
path = Telegram/ThirdParty/expected
url = https://github.com/TartanLlama/expected
[submodule "Telegram/ThirdParty/QR"]
path = Telegram/ThirdParty/QR
url = https://github.com/nayuki/QR-Code-generator
[submodule "Telegram/lib_qr"]
path = Telegram/lib_qr
url = https://github.com/desktop-app/lib_qr.git