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 |
||
|---|---|---|
| .. | ||
| field_autocomplete.cpp | ||
| field_autocomplete.h | ||
| history.style | ||
| history_common.h | ||
| history_service_layout.cpp | ||
| history_service_layout.h | ||