tdesktop/Telegram/SourceFiles/history
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
..
field_autocomplete.cpp Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
field_autocomplete.h Seek done in video player in MediaView. Some memory leaks fixed. 2016-07-13 20:34:57 +03:00
history.style Merge branch 'master' into dev 2016-07-08 13:26:28 +03:00
history_common.h Received messages are not marked as read while scroll is at the top. 2016-06-03 15:45:33 +03:00
history_service_layout.cpp Improved service messages layout. 2016-07-08 13:06:41 +03:00
history_service_layout.h Improved service messages layout. 2016-07-08 13:06:41 +03:00