tdesktop/Telegram/SourceFiles/serialize
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
..
serialize_common.cpp Saving FlatTextarea tags to drafts, applying them in setText. 2016-05-05 19:04:17 +03:00
serialize_common.h Saving FlatTextarea tags to drafts, applying them in setText. 2016-05-05 19:04:17 +03:00
serialize_document.cpp Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
serialize_document.h Version raised to 0.9.58. Version field of documents supported. 2016-07-08 16:56:53 +03:00