mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-14 10:55:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixed merge error

Browse source
This commit is contained in:
Steffen Kolmer 2020-10-19 13:24:22 +02:00
parent c86964cd5e
commit 4106f70218
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/settings/Settings.ts
View file

@ -626,6 +626,7 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_ACCOUNT_SETTINGS, supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("Don't show chat effects"), displayName: _td("Don't show chat effects"),
default: false, default: false,
},
"Widgets.pinned": { "Widgets.pinned": {
supportedLevels: LEVELS_ROOM_OR_ACCOUNT, supportedLevels: LEVELS_ROOM_OR_ACCOUNT,
default: {}, default: {},