John Preston 36fc7d1991 Merge branch 'master' into temp ... Conflicts: Telegram/SourceFiles/settings/settings_widget.cpp		2017-02-18 14:37:57 +03:00
..
settings.style	…
settings_advanced_widget.cpp	…
settings_advanced_widget.h	…
settings_background_widget.cpp	…
settings_background_widget.h	…
settings_block_widget.cpp	…
settings_block_widget.h	…
settings_chat_settings_widget.cpp	…
settings_chat_settings_widget.h	…
settings_cover.cpp	…
settings_cover.h	…
settings_fixed_bar.cpp	…
settings_fixed_bar.h	…
settings_general_widget.cpp	…
settings_general_widget.h	…
settings_info_widget.cpp	…
settings_info_widget.h	…
settings_inner_widget.cpp	…
settings_inner_widget.h	…
settings_layer.cpp	…
settings_layer.h	…
settings_notifications_widget.cpp	…
settings_notifications_widget.h	…
settings_privacy_widget.cpp	…
settings_privacy_widget.h	…
settings_scale_widget.cpp	…
settings_scale_widget.h	…
settings_widget.cpp	…
settings_widget.h	…