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 |
||
---|---|---|
.. | ||
basic_types.cpp | ||
basic_types.h | ||
click_handler.cpp | ||
click_handler.h | ||
click_handler_types.cpp | ||
click_handler_types.h | ||
observer.cpp | ||
observer.h | ||
vector_of_moveable.h | ||
version.h |