Merge branch 'master' into package-server-tls

diff --cc wcfsetup/install/files/acp/templates/index.tpl
Simple merge

diff --cc wcfsetup/install/files/lib/acp/page/IndexPage.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
index dea94704dc7d95df2f57fa8aff4e7240b6aa6c9d,aaedcecda7539c2e6935690cff6b3e05ac6ed8dc..a6272a84ef52eac3d5ce6b32facd973cdf44d819
--- 1/wcfsetup/install/lang/de.xml
--- 2/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 3104b694311c61595943f4a2b11fdc85d56477f0,565eb7391648c5cff5ff555df7e84dce2662b496..3a61b11937a90f6765ccff3f6f8f5c43bd318c14
--- 1/wcfsetup/install/lang/en.xml
--- 2/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>