summary refs log tree commit diff
path: root/src/timeline/TimelineModel.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-04-23 18:40:07 -0400
committerGitHub <noreply@github.com>2020-04-23 18:40:07 -0400
commit69b0b68f92f2589eab86970ffc76d727e6c7738e (patch)
treebd3d14589357b29f502f2d0cb7191abafe83332a /src/timeline/TimelineModel.cpp
parentFix own messages not showing as encrypted (diff)
parentTerminate user color calculation, when no solution can be found (diff)
downloadnheko-69b0b68f92f2589eab86970ffc76d727e6c7738e.tar.xz
Merge branch 'master' into decrypt-sidebar
Diffstat (limited to 'src/timeline/TimelineModel.cpp')
0 files changed, 0 insertions, 0 deletions