Merge master and fix conflicts

2021-07-24 18:26:25 -04:00 · 2021-07-24 18:26:25 -04:00 · 3f567a8da7
commit 3f567a8da7
parent 19f2c02eda a61678242b
87 changed files with 5667 additions and 2989 deletions
--- a/src/ui/RoomSettings.h
+++ b/src/ui/RoomSettings.h
@ -134,4 +134,4 @@ private:
        RoomInfo info_;
        int notifications_ = 0;
        int accessRules_   = 0;
-};
+};