4 Commits

Author SHA1 Message Date
Ilya Laktyushin
bd96489d15 Merge branch 'master' of github.com:peter-iakovlev/TelegramUI
# Conflicts:
#	TelegramUI/PresentationStrings.swift
#	TelegramUI/Resources/PresentationStrings.mapping
2018-11-11 22:27:51 +04:00
Peter
6a47e739a3 no message 2018-01-09 13:18:08 +04:00
Peter
baf29247eb no message 2017-09-05 21:27:04 +03:00
Peter
cbbcb12b3b no message 2017-08-15 14:44:14 +03:00