1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-07 10:46:24 +03:00

Merge branch 'develop' into watch-show-timestamps

This commit is contained in:
Robin Townsend
2021-07-18 11:45:33 -04:00
391 changed files with 8665 additions and 5752 deletions

View File

@@ -45,6 +45,7 @@ const RoomContext = createContext<IState>({
showTwelveHourTimestamps: false,
readMarkerInViewThresholdMs: 3000,
readMarkerOutOfViewThresholdMs: 30000,
showHiddenEventsInTimeline: false,
showReadReceipts: true,
showRedactions: true,
showJoinLeaves: true,