mirror of
https://github.com/vale981/tdesktop
synced 2025-03-07 02:31:41 -05:00
![]() Merge branch 'archived_stickers' into cancel_reset. Conflicts: Telegram/Resources/winrc/Telegram.rc Telegram/Resources/winrc/Updater.rc Telegram/SourceFiles/app.cpp Telegram/SourceFiles/core/version.h Telegram/SourceFiles/localstorage.cpp Telegram/Telegram.vcxproj.filters Telegram/Telegram.xcodeproj/project.pbxproj Telegram/build/version |
||
---|---|---|
.. | ||
art | ||
etc | ||
icons | ||
langs | ||
qmime | ||
winrc | ||
all_files.style | ||
basic.style | ||
basic_types.style | ||
numbers.txt | ||
telegram.qrc | ||
telegram_emojis.qrc | ||
telegram_linux.qrc | ||
telegram_mac.qrc | ||
telegram_wnd.qrc |