diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-11-17 18:38:03 +0100 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-11-17 18:38:03 +0100 |
| commit | 0052c0b2b4f9860ee9223ef161f40929e7c4c454 (patch) | |
| tree | 4a2a869a2ce437ba17c7269e8e904276a11db62a /lib/events/roomevent.h | |
| parent | b472fc355dc5ce70391ca2b9bc8da35b973ae3a3 (diff) | |
| parent | d5515bb6dd8ebf46aa36a8bc696b90a573a8492c (diff) | |
| download | libquotient-0052c0b2b4f9860ee9223ef161f40929e7c4c454.tar.gz libquotient-0052c0b2b4f9860ee9223ef161f40929e7c4c454.zip | |
Merge branch 'dev' into kitsune-fix-read-receipts-and-markers
# Conflicts:
# lib/room.cpp
Diffstat (limited to 'lib/events/roomevent.h')
0 files changed, 0 insertions, 0 deletions