diff options
author | Joseph Donofry <joedonofry@gmail.com> | 2021-02-01 18:42:38 -0500 |
---|---|---|
committer | Joseph Donofry <joedonofry@gmail.com> | 2021-02-01 18:42:38 -0500 |
commit | 53c653a228f529bab3753ca99dee18a5bf5342a2 (patch) | |
tree | ad0ba40d27ca5a515f1f33c29c910e5cf7b20dd7 /src/MatrixClient.cpp | |
parent | Remove redundant import and fix visible warning (diff) | |
parent | Fix emojis with fe0f in the middle (diff) | |
download | nheko-53c653a228f529bab3753ca99dee18a5bf5342a2.tar.xz |
Merge remote-tracking branch 'nheko-im/master' into privacy_screen
Diffstat (limited to 'src/MatrixClient.cpp')
-rw-r--r-- | src/MatrixClient.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/MatrixClient.cpp b/src/MatrixClient.cpp |