Merge branch '5.2'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:50:06 +0000 (10:50 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:50:06 +0000 (10:50 +0200)
commit294b1e6975d5e2667fb98344e1cf850da9a6994c
tree951c670ccbe0240f859bddd49bcd469d661b02f1
parentce8c322f5c788c33d62fa95612be3f8350d9ec11
parent0a51cf5de6a409b9a1bdde9b5135135706413c9e
Merge branch '5.2'
templates/conversationList.tpl