Merge branch 'develop' into gsouquet/cache-decrypt
This commit is contained in:
commit
17f4945323
56 changed files with 1140 additions and 649 deletions
|
@ -150,7 +150,7 @@ export class BreadcrumbsStore extends AsyncStoreWithClient<IState> {
|
|||
}
|
||||
|
||||
private async appendRoom(room: Room) {
|
||||
if (room.isSpaceRoom() && SettingsStore.getValue("feature_spaces")) return; // hide space rooms
|
||||
if (SettingsStore.getValue("feature_spaces") && room.isSpaceRoom()) return; // hide space rooms
|
||||
let updated = false;
|
||||
const rooms = (this.state.rooms || []).slice(); // cheap clone
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue