AyuGramDesktop/Telegram/Resources/winrc
AlexeyZavar 01b8602437 Merge tag 'v5.1.2' into dev
# Conflicts:
#	Telegram/Resources/winrc/Telegram.rc
#	Telegram/Resources/winrc/Updater.rc
#	Telegram/SourceFiles/boxes/send_files_box.cpp
#	Telegram/SourceFiles/core/version.h
#	Telegram/SourceFiles/data/data_search_controller.cpp
#	Telegram/SourceFiles/dialogs/dialogs_widget.cpp
#	Telegram/SourceFiles/dialogs/dialogs_widget.h
#	Telegram/SourceFiles/history/view/media/history_view_gif.cpp
#	Telegram/SourceFiles/mainwidget.cpp
#	Telegram/lib_ui
2024-06-04 03:29:15 +03:00
..
Telegram.manifest Set UTF-8 code page in Windows manifest 2023-01-19 08:34:46 +04:00
Telegram.rc Merge tag 'v5.1.2' into dev 2024-06-04 03:29:15 +03:00
Updater.rc Merge tag 'v5.1.2' into dev 2024-06-04 03:29:15 +03:00