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 |
||
|---|---|---|
| .. | ||
| text.cpp | ||
| text.h | ||
| text_block.cpp | ||
| text_block.h | ||
| text_entity.cpp | ||
| text_entity.h | ||