Merge branch '5.2' into 5.3
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Nov 2020 19:10:26 +0000 (20:10 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Nov 2020 19:10:26 +0000 (20:10 +0100)
commitc86ab1a9f5ab04e7da090f1058ce3b537df36055
treeebc02b4fdb9021a0173301ece6ab8e0fa90ba995
parent8bb9ee2598b8f9804d1902e6ce885235bdbc91bc
parente3cc007c4ff90573c4a7745abb0f256f807f5a8f
Merge branch '5.2' into 5.3
templates/conversation.tpl