ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-04 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into voiceover

Browse Source
This commit is contained in:
Peter 2019-02-01 21:44:33 +04:00
commit 5bc4eb79b8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -3967,3 +3967,5 @@ Unused sets are archived when you add more.";
"Wallpaper.ResetWallpapers" = "Reset Chat Backgrounds";
"Wallpaper.ResetWallpapersInfo" = "Remove all uploaded chat backgrounds and restore pre-installed backgrounds for all themes.";
"Wallpaper.ResetWallpapersConfirmation" = "Reset Chat Backgrounds";
"Proxy.TooltipUnavailable" = "The proxy may be unavailable. Try selecting another one.";

2
submodules/Postbox

@ -1 +1 @@
Subproject commit 1f94086baf4e43cc5c459aab1f56027e3bf4edf3
Subproject commit 69e6f805b3c6e89354a329871ce7389f8dd4528f

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 112d1ed974497fadee7220ee4552035c0cfd113d
Subproject commit 94ed17e1b7431c38bc7a9fdb397f5ab764f0316f