2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-29 05:29:23 +00:00
John Preston 36fc7d1991 Merge branch 'master' into temp
Conflicts:
	Telegram/SourceFiles/settings/settings_widget.cpp
2017-02-18 14:37:57 +03:00
..
2017-02-15 21:27:31 +03:00
2017-02-15 21:27:31 +03:00
2017-02-15 21:27:31 +03:00
2017-02-18 14:37:57 +03:00
2017-02-15 21:27:31 +03:00
2017-02-17 22:59:25 +03:00
2017-02-18 14:37:57 +03:00
2017-02-15 21:27:31 +03:00
2017-02-15 21:27:31 +03:00
2017-02-15 21:27:31 +03:00
2017-02-15 21:27:31 +03:00
2017-02-10 01:29:20 +03:00
2017-02-18 14:37:57 +03:00
2017-02-18 14:37:57 +03:00