John Preston 2aa35af909 Merge branch 'master' into dev ... Conflicts: Telegram/SourceFiles/history/history.style		2016-07-08 13:26:28 +03:00
..
dialogs.style	Merge branch 'master' into dev	2016-07-08 13:26:28 +03:00
dialogs_common.h
dialogs_indexed_list.cpp
dialogs_indexed_list.h
dialogs_layout.cpp	Merge branch 'master' into dev	2016-07-08 13:26:28 +03:00
dialogs_layout.h
dialogs_list.cpp
dialogs_list.h
dialogs_row.cpp
dialogs_row.h