From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Tue, 26 Sep 2023 10:43:48 +0000 (+0200)
Subject: Merge branch '5.5' into 6.0
X-Git-Tag: 6.0.0_RC_2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b71808d6adf6af585bd400150092359d751e330;p=GitHub%2FWoltLab%2Fcom.woltlab.wcf.conversation.git

Merge branch '5.5' into 6.0
---

3b71808d6adf6af585bd400150092359d751e330
diff --cc fileDelete.xml
index 2be0004,b4f0cc0..7a6c9a0
--- a/fileDelete.xml
+++ b/fileDelete.xml
@@@ -9,9 -7,9 +9,10 @@@
  		<file>acp/update_com.woltlab.wcf.conversation_3.1_addColumn.php</file>
  		<file>acp/update_com.woltlab.wcf.conversation_5.2.php</file>
  		<file>acp/update_com.woltlab.wcf.conversation_5.4_deleteLanguageItems.php</file>
 +		<file>acp/update_com.woltlab.wcf.conversation_5.5_cleanup_orphaned_attachments.php</file>
  		<file>js/WoltLab/Conversation/UI/Participant/Add.js</file>
  		<file>js/WoltLab/Conversation/Ui/Participant/Add.js</file>
+ 		<file>js/require.build.js</file>
  		<file>js/require.build.min.js</file>
  		<file>lib/form/ConversationMessageAddForm.class.php</file>
  		<file>lib/form/ConversationMessageEditForm.class.php</file>