Merge branch '5.5' into 6.0
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Sep 2023 07:12:54 +0000 (09:12 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 27 Sep 2023 07:12:54 +0000 (09:12 +0200)
commita3c8ddeb6091c05e72a5bddb148360119074519f
treed3c6c757d7fa04a5b1f34fdf614bf8400f7926ca
parentab519df5d3b45b972e3d8314f602e3c8b5953b81
parentc8bf43a9af5967e521398f2db5c1c6f8a2f46c79
Merge branch '5.5' into 6.0
files/lib/data/conversation/Conversation.class.php
files/lib/data/conversation/ConversationEditor.class.php