520260f207
Conflicts: Telegram/SourceFiles/app.cpp Telegram/SourceFiles/codegen/style/processor.cpp Telegram/SourceFiles/history.cpp Telegram/SourceFiles/historywidget.cpp Telegram/SourceFiles/mainwidget.cpp Telegram/SourceFiles/mainwidget.h Telegram/SourceFiles/profilewidget.cpp Telegram/SourceFiles/profilewidget.h Telegram/Telegram.vcxproj Telegram/Telegram.vcxproj.filters |
||
---|---|---|
.. | ||
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 |