John Preston d806d079a2 Merge branch 'master' into video ...

Conflicts:
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/ui/animation.cpp
	Telegram/Telegram.pro

2016-07-11 21:12:10 +03:00

..

overview_layout.cpp

Merge branch 'master' into video

2016-07-11 21:12:10 +03:00

overview_layout.h

Selection of text in attachments: captions, web page previews.

2016-04-13 21:29:32 +03:00

overview.style

Dialog styles moved from basic.style to dialogs.style.

2016-06-07 22:59:39 +03:00