tdesktop/Telegram/Resources
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
..
art Featured stickers fully supported (unread badges, box, adding, etc). 2016-06-28 21:05:38 +03:00
etc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
icons Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
langs Showing archived stickers button, archived stickers box with loading. 2016-07-21 16:57:31 +03:00
qmime Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
winrc Version bumped to 0.9.61 stable. 2016-07-25 22:54:40 +03:00
all_files.style Video play in MediaView support done in Xcode/QtCreator projects. 2016-07-19 15:31:48 +03:00
basic.style When installing sticker set some sets can be archived. 2016-07-18 18:39:10 +03:00
basic_types.style Merge branch 'master' into video 2016-07-11 21:12:10 +03:00
numbers.txt merged master 2015-08-18 19:10:01 +03:00
telegram.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_emojis.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_linux.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_mac.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00
telegram_wnd.qrc Moved .qrc, langs and art files from SourceFiles to Resources folder. 2016-04-09 17:17:09 +04:00