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
..
build	Version 0.9.48 with bugfixes.	2016-05-10 11:57:55 +03:00
MetaEmoji.xcodeproj
MetaLang.xcodeproj
Packer.xcodeproj
Patches
Resources	Version 0.9.48 with bugfixes.	2016-05-10 11:57:55 +03:00
SetupFiles
SourceFiles	Merge branch 'master' into mentions	2016-05-10 14:19:01 +03:00
Telegram/Images.xcassets
Telegram.xcodeproj	Version 0.9.48 with bugfixes.	2016-05-10 11:57:55 +03:00
ThirdParty/minizip
Updater.xcodeproj
Emoji.plist
Lang.plist
MetaEmoji.pro
MetaEmoji.vcxproj
MetaEmoji.vcxproj.filters
MetaLang.pro
MetaLang.vcxproj
MetaLang.vcxproj.filters
Packer.plist
Packer.pro
Packer.vcxproj
Packer.vcxproj.filters
Telegram.plist
Telegram.pro
Telegram.vcxproj
Telegram.vcxproj.filters
Updater.pro
Updater.vcxproj
Updater.vcxproj.filters