kepka/Telegram/Telegram.xcodeproj
John Preston dbdf28d0a0 Version bumped to 0.9.61 stable.
Merge branch 'archived_stickers' into cancel_reset.

Conflicts:
	Telegram/Resources/winrc/Telegram.rc
	Telegram/Resources/winrc/Updater.rc
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/Telegram.vcxproj.filters
	Telegram/Telegram.xcodeproj/project.pbxproj
	Telegram/build/version
2016-07-25 22:54:40 +03:00
..
project.pbxproj Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
qt_preprocess.mak Video play in MediaView support done in Xcode/QtCreator projects. 2016-07-19 15:31:48 +03:00