From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Fri, 13 May 2022 07:22:56 +0000 (+0200)
Subject: Merge branch 'master' into package-server-tls
X-Git-Tag: 6.0.0_Alpha_1~1309^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0fad6330959f8ab83f6b6c91752516d3d112be3b;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into package-server-tls
---

0fad6330959f8ab83f6b6c91752516d3d112be3b
diff --cc wcfsetup/install/lang/de.xml
index dea94704dc,aaedcecda7..a6272a84ef
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@@ -5564,9 -5565,7 +5564,11 @@@ Benachrichtigungen auf <a href="{link i
  	</category>
  </import>
  <delete>
 +	<item name="wcf.acp.pluginStore.api.noSSL"/>
 +	<item name="wcf.acp.index.system.php.sslSupport"/>
 +	<item name="wcf.acp.index.system.php.sslSupport.available"/>
 +	<item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+ 	<item name="wcf.acp.option.http_send_x_frame_options"/>
+ 	<item name="wcf.acp.option.http_send_x_frame_options.description"/>
  </delete>
  </language>
diff --cc wcfsetup/install/lang/en.xml
index 3104b69431,565eb73916..3a61b11937
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@@ -5566,9 -5567,7 +5566,11 @@@ your notifications on <a href="{link is
  	</category>
  </import>
  <delete>
 +	<item name="wcf.acp.pluginStore.api.noSSL"/>
 +	<item name="wcf.acp.index.system.php.sslSupport"/>
 +	<item name="wcf.acp.index.system.php.sslSupport.available"/>
 +	<item name="wcf.acp.index.system.php.sslSupport.notAvailable"/>
+ 	<item name="wcf.acp.option.http_send_x_frame_options"/>
+ 	<item name="wcf.acp.option.http_send_x_frame_options.description"/>
  </delete>
  </language>