Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093
Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json
This commit is contained in:
commit
02dbdc5c0a
41 changed files with 1672 additions and 709 deletions
|
@ -194,6 +194,11 @@ export enum Action {
|
|||
*/
|
||||
SwitchSpace = "switch_space",
|
||||
|
||||
/**
|
||||
* Signals to the visible space hierarchy that a change has occurred an that it should refresh.
|
||||
*/
|
||||
UpdateSpaceHierarchy = "update_space_hierarchy",
|
||||
|
||||
/**
|
||||
* Fires when a monitored setting is updated,
|
||||
* see SettingsStore::monitorSetting for more details.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue