Merge branch '5.5' into 6.0
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 26 Sep 2023 09:40:06 +0000 (11:40 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 26 Sep 2023 09:40:06 +0000 (11:40 +0200)
commit75e3a458e8f59799049e1fd9a1128b7ff1c4c59d
treefd9ca2321c7041e48d1ada0558286b569782acd6
parentbd1225ed76c696dbe1f11e8627cbdda245888bd9
parent1f8a02a79c255095626c32114b558532401a17a8
Merge branch '5.5' into 6.0
files/lib/data/conversation/ConversationAction.class.php
files/lib/page/ConversationPage.class.php