diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-08-17 20:40:33 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2020-08-17 20:40:33 +0200 |
| commit | de7ec4d2b38888ee88d0a45b05d5a4a7cc730a4d (patch) | |
| tree | 7d65f5bcbe6996c24f0f5103160e0d4d23bb0983 /src/ui/UserProfile.cpp | |
| parent | Add /clear-timeline command (diff) | |
| parent | Merge pull request #237 from trilene/voip (diff) | |
| download | nheko-de7ec4d2b38888ee88d0a45b05d5a4a7cc730a4d.tar.xz | |
Merge remote-tracking branch 'origin/master' into new-event-store
Conflicts: CMakeLists.txt io.github.NhekoReborn.Nheko.json src/Cache.cpp src/timeline/TimelineModel.cpp src/timeline/TimelineModel.h src/timeline/TimelineViewManager.cpp
Diffstat (limited to 'src/ui/UserProfile.cpp')
0 files changed, 0 insertions, 0 deletions