mirror of https://github.com/procxx/kepka.git
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 | ||