diff options
| author | Joseph Donofry <joedonofry@gmail.com> | 2020-05-16 15:10:49 -0400 |
|---|---|---|
| committer | Joseph Donofry <joedonofry@gmail.com> | 2020-05-16 15:10:49 -0400 |
| commit | a5778bdf400660f35d6824add12cd8bd78f54336 (patch) | |
| tree | 379eb6a7a7b7b89bc3086752b6ef317599a2182f /src/ChatPage.cpp | |
| parent | Merge master into reactions (diff) | |
| parent | Merge pull request #202 from aaronraimist/brew-libolm (diff) | |
| download | nheko-a5778bdf400660f35d6824add12cd8bd78f54336.tar.xz | |
Merge remote-tracking branch 'origin/master' into reactions
Diffstat (limited to 'src/ChatPage.cpp')
| -rw-r--r-- | src/ChatPage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp |
