mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2026-07-25 15:04:57 +00:00
6a02bd66a9
# Conflicts: # Telegram/Resources/winrc/Telegram.rc # Telegram/Resources/winrc/Updater.rc # Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp # Telegram/SourceFiles/core/version.h # Telegram/SourceFiles/info/profile/info_profile_actions.cpp # Telegram/SourceFiles/mtproto/facade.h # Telegram/SourceFiles/storage/file_upload.cpp # Telegram/SourceFiles/storage/file_upload.h # Telegram/SourceFiles/window/window_main_menu.cpp # Telegram/lib_ui # snap/snapcraft.yaml