Merge branch 'develop' into watch-show-timestamps

2021-07-18 11:47:44 -04:00
parent 2021650d77 4ef4f49e90
commit c0123f5dad
391 changed files with 8665 additions and 5752 deletions
@@ -45,6 +45,7 @@ const RoomContext = createContext<IState>({
    showTwelveHourTimestamps: false,
    readMarkerInViewThresholdMs: 3000,
    readMarkerOutOfViewThresholdMs: 30000,
+    showHiddenEventsInTimeline: false,
    showReadReceipts: true,
    showRedactions: true,
    showJoinLeaves: true,