Merge branch '6.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 15 Apr 2024 15:28:47 +0000 (17:28 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 15 Apr 2024 15:28:47 +0000 (17:28 +0200)
commit7af6291917af5f898c088117dd7934206a903c61
tree88d7089f98fce26a10050037982c74c8912e1144
parent1e49678441dd9d0881c41464301b77cd03a1622f
parent70eba689ede53b5da5a7bca5c8bac0fa9dd372c2
Merge branch '6.0'
files/lib/data/conversation/ConversationAction.class.php
language/de.xml
package.xml
templates/conversationList.tpl