Merge branch '3.1' into 5.2
authorMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:49:52 +0000 (10:49 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 24 May 2020 08:49:52 +0000 (10:49 +0200)
commit0a51cf5de6a409b9a1bdde9b5135135706413c9e
tree8ca5155acaca6167ea9a54229de59057151ea0b2
parent2a113051a5a3d612597e6e8645b1947690d3db41
parent249ebcd573d15c5c842a800bea582c6d6ef0b465
Merge branch '3.1' into 5.2
templates/conversationList.tpl