diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2020-06-09 20:51:36 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2020-06-09 20:51:36 -0400 |
| commit | 6bb73f84a3075abe7a1c1fd2d56a259740070c70 (patch) | |
| tree | eecb0bc3ec18a04cd226d1caea74b2b65ef6d851 /src/RoomList.cpp | |
| parent | Minor adjustments to emoji picker (diff) | |
| parent | Smooth scaling for images (diff) | |
| download | nheko-6bb73f84a3075abe7a1c1fd2d56a259740070c70.tar.xz | |
Merge master and fix conflicts
Diffstat (limited to 'src/RoomList.cpp')
| -rw-r--r-- | src/RoomList.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/RoomList.cpp b/src/RoomList.cpp |