matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-14 19:02:33 +03:00
Code Activity

Merge branch 'develop' into redaction-timestamp

Browse Source
This commit is contained in:
Aaron Raimist
2020-05-22 15:16:12 -05:00
parent b0be99a8f0 696f158be0
commit c2dd4a5771
9 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/rooms/RoomList.js
View File

@@ -44,6 +44,7 @@ import {RoomListStoreTempProxy} from "../../../stores/room-list/RoomListStoreTem
import {DefaultTagID} from "../../../stores/room-list/models";
import * as Unread from "../../../Unread";
import RoomViewStore from "../../../stores/RoomViewStore";
import {TAG_DM} from "../../../stores/RoomListStore";
const HIDE_CONFERENCE_CHANS = true;
const STANDARD_TAGS_REGEX = /^(m\.(favourite|lowpriority|server_notice)|im\.vector\.fake\.(invite|recent|direct|archived))$/;