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 |
||
|---|---|---|
| .. | ||
| qmake | ||
| vc | ||
| xcode | ||
| build.bat | ||
| build.sh | ||
| deploy.sh | ||
| makefile_static.sh | ||
| replace.vbs | ||
| set_version.bat | ||
| set_version.sh | ||
| setup.iss | ||
| version | ||