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 |
||
|---|---|---|
| .. | ||
| main_window.cpp | ||
| main_window.h | ||
| section_memento.h | ||
| section_widget.cpp | ||
| section_widget.h | ||
| slide_animation.cpp | ||
| slide_animation.h | ||
| top_bar_widget.cpp | ||
| top_bar_widget.h | ||