Commit Graph

5 Commits

Author SHA1 Message Date
overtake
fd8560c517 Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
# Conflicts:
#	submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
#	submodules/TelegramUI/TelegramUI/ChatController.swift
#	submodules/TelegramUI/TelegramUI/NavigateToChatController.swift
2019-06-25 18:30:20 +02:00
overtake
10e3733a88 ipad fixes 2019-06-25 17:01:19 +02:00
Ilya Laktyushin
653ed2993e Peers Nearby improvements and bug fixes 2019-06-19 19:04:22 +02:00
Ilya Laktyushin
1a42a4c389 Peers nearby improvements 2019-06-19 00:32:27 +02:00
Peter
b317aab568 Add 'submodules/TelegramUI/' from commit 'fa3ac0b61a27c8dd3296518a15891a6f9750cbf2'
git-subtree-dir: submodules/TelegramUI
git-subtree-mainline: 5c1613d104
git-subtree-split: fa3ac0b61a
2019-06-11 19:00:46 +01:00