summary refs log tree commit diff
path: root/src/Cache.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-05-14 20:53:01 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-05-14 20:53:01 -0400
commit6d2789f4d5ffcd4e3e6ad8dfaae6925b0bf7d6ae (patch)
tree2ce43f344f002d2747f5f68b9d87b81873ed87ce /src/Cache.cpp
parentUpdate emoji picker and translations (diff)
parentMerge branch 'master' of ssh://github.com/Nheko-Reborn/nheko (diff)
downloadnheko-6d2789f4d5ffcd4e3e6ad8dfaae6925b0bf7d6ae.tar.xz
Merge master into reactions
Diffstat (limited to 'src/Cache.cpp')
-rw-r--r--src/Cache.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Cache.cpp b/src/Cache.cpp

index 8cfc4b55..3a388bb9 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp
@@ -1338,7 +1338,7 @@ Cache::getLastMessageInfo(lmdb::txn &txn, const std::string &room_id) auto time = QDateTime::fromMSecsSinceEpoch(ts); fallbackDesc = DescInfo{QString::fromStdString(obj["event"]["event_id"]), local_user, - tr("You joined this room"), + tr("You joined this room."), utils::descriptiveTime(time), ts, time};