diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-02-02 13:00:53 -0500 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2021-02-02 13:00:53 -0500 |
| commit | aeec1e12fc91bf394378fd0e22b8477aac5dbb2f (patch) | |
| tree | 476706301fd2364055bf80797cb5e5e1c782cda9 /src/MatrixClient.cpp | |
| parent | Fix unused capture warning (diff) | |
| parent | Merge pull request #444 from LorenDB/dragDropTimeline (diff) | |
| download | nheko-aeec1e12fc91bf394378fd0e22b8477aac5dbb2f.tar.xz | |
Merge branch 'master' into 'privacy_screen'
# Conflicts: # resources/qml/TimelineView.qml
Diffstat (limited to 'src/MatrixClient.cpp')
0 files changed, 0 insertions, 0 deletions