diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-02 08:36:56 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-02 08:36:56 -0700 |
| commit | b2052de746f8e5f4ca600142fd43b64ceb6c8b84 (patch) | |
| tree | 99474e75e399fc530a73cfb3cdc10d74bcbc0b01 /web/react/components/user_settings/user_settings_notifications.jsx | |
| parent | 9d688821aa8bb8d766793aeaec6920f9985a30a3 (diff) | |
| parent | c427e9c9d6fbd68662fdfbbe733af4b34ae69269 (diff) | |
| download | chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.tar.gz chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.tar.bz2 chat-b2052de746f8e5f4ca600142fd43b64ceb6c8b84.zip | |
Merge branch 'master' into PLT-462
Diffstat (limited to 'web/react/components/user_settings/user_settings_notifications.jsx')
| -rw-r--r-- | web/react/components/user_settings/user_settings_notifications.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx index 42c65ef5d..e83f18aab 100644 --- a/web/react/components/user_settings/user_settings_notifications.jsx +++ b/web/react/components/user_settings/user_settings_notifications.jsx @@ -17,7 +17,7 @@ function getNotificationsStateFromStores() { if (user.notify_props && user.notify_props.desktop_sound) { sound = user.notify_props.desktop_sound; } - var desktop = 'all'; + var desktop = 'default'; if (user.notify_props && user.notify_props.desktop) { desktop = user.notify_props.desktop; } |