Merge branch 'develop' into gsouquet/threads-forceenablelabsflag
This commit is contained in:
commit
d4f247d1fe
97 changed files with 3280 additions and 1325 deletions
|
@ -340,13 +340,6 @@ export const SETTINGS: { [setting: string]: ISetting } = {
|
|||
supportedLevels: LEVELS_FEATURE,
|
||||
default: false,
|
||||
},
|
||||
"feature_extensible_events": {
|
||||
isFeature: true,
|
||||
labsGroup: LabGroup.Developer, // developer for now, eventually Messaging and default on
|
||||
supportedLevels: LEVELS_FEATURE,
|
||||
displayName: _td("Show extensible event representation of events"),
|
||||
default: false,
|
||||
},
|
||||
"useOnlyCurrentProfiles": {
|
||||
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
|
||||
displayName: _td("Show current avatar and name for users in message history"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue