kepka/Telegram/Resources/winrc
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
..
Telegram.rc Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
Updater.rc Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
resource.h Added moved files to git. 2016-04-27 15:03:10 +03:00
resource1.h Added moved files to git. 2016-04-27 15:03:10 +03:00