2
0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-29 05:29:23 +00:00
John Preston 107a1e7e5d Merge branch 'master' into mentions
Conflicts:
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/build/version
2016-05-10 14:19:01 +03:00
..
2016-05-10 11:57:55 +03:00