From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 18 Jan 2019 16:51:10 +0000 (+0100)
Subject: Merge branch '3.0'
X-Git-Tag: 3.1.8~23
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=de1a6c6a4f4f1cb7a583f6cc4c267dcd4dab9c6a;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.0'
---

de1a6c6a4f4f1cb7a583f6cc4c267dcd4dab9c6a
diff --cc com.woltlab.wcf/page.xml
index 909416ed95,9a38104e5d..dc62bbc7f0
--- a/com.woltlab.wcf/page.xml
+++ b/com.woltlab.wcf/page.xml
@@@ -624,9 -564,9 +624,9 @@@
  <li><a href="https://support.google.com/chrome/answer/95647?hl=en" class="externalURL" rel="nofollow">Google Chrome</a></li>
  <li><a href="https://privacy.microsoft.com/en-us/windows-10-microsoft-edge-and-privacy" class="externalURL" rel="nofollow">Microsoft Edge</a></li>
  <li><a href="https://support.mozilla.org/en-US/kb/cookies-information-websites-store-on-your-computer" class="externalURL" rel="nofollow">Mozilla Firefox</a></li>
- <li><a href="https://help.opera.com/Windows/12.00/en/cookies.html" class="externalURL" rel="nofollow">Opera</a></li>
+ <li><a href="https://blogs.opera.com/news/2015/08/how-to-manage-cookies-in-opera/" class="externalURL" rel="nofollow">Opera</a></li>
 -<li><a href="https://support.apple.com/guide/safari/manage-cookies-and-website-data-sfri11471/" class="externalURL" rel="nofollow">Safari</a></li>
 -<li><a href="http://windows.microsoft.com/en-US/internet-explorer/delete-manage-cookies" class="externalURL" rel="nofollow">Windows Internet Explorer</a></li>
 +<li><a href="https://support.apple.com/kb/ph17191?locale=en_US" class="externalURL" rel="nofollow">Safari</a></li>
 +<li><a href="https://windows.microsoft.com/en-US/internet-explorer/delete-manage-cookies" class="externalURL" rel="nofollow">Windows Internet Explorer</a></li>
  </ul>]]></content>
  				<customURL>cookie-policy</customURL>
  			</content>