dbdf28d0a0
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 |
||
|---|---|---|
| .. | ||
| inline_bot_layout_internal.cpp | ||
| inline_bot_layout_internal.h | ||
| inline_bot_layout_item.cpp | ||
| inline_bot_layout_item.h | ||
| inline_bot_result.cpp | ||
| inline_bot_result.h | ||
| inline_bot_send_data.cpp | ||
| inline_bot_send_data.h | ||