diff options
| author | Joe <rubberduckie3554@gmail.com> | 2021-07-24 18:26:25 -0400 |
|---|---|---|
| committer | Joe <rubberduckie3554@gmail.com> | 2021-07-24 18:26:25 -0400 |
| commit | 3f567a8da7f41a2ce094f15340e39ea8aec55fb3 (patch) | |
| tree | 42b6f59f0fa36ad738133198333cccf0c4100621 /src/ui | |
| parent | Remove 'respond to key requests' functionality (diff) | |
| parent | Fix edge case that could lead to no new one time keys being uploaded (diff) | |
| download | nheko-3f567a8da7f41a2ce094f15340e39ea8aec55fb3.tar.xz | |
Merge master and fix conflicts
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/RoomSettings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h |