From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 15 Apr 2018 12:54:39 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: 5.2.0_Alpha_1~140^2~38
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=63591b17e1eda0acdfe491c3e5fe9b52479d5488;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'master' into next
---

63591b17e1eda0acdfe491c3e5fe9b52479d5488
diff --cc wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
index 25e7546b15,bd4ac5386a..44116e3ab3
--- a/wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
+++ b/wcfsetup/install/files/lib/data/label/group/LabelGroupAction.class.php
@@@ -1,6 -1,6 +1,7 @@@
  <?php
 +declare(strict_types=1);
  namespace wcf\data\label\group;
+ use wcf\data\label\LabelAction;
  use wcf\data\language\item\LanguageItemAction;
  use wcf\data\object\type\ObjectTypeCache;
  use wcf\data\AbstractDatabaseObjectAction;
diff --cc wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
index 4fe55d1fb7,40f181ff15..78dd78c8ea
--- a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
@@@ -1,6 -1,6 +1,7 @@@
  <?php
 +declare(strict_types=1);
  namespace wcf\system\bbcode;
+ use wcf\data\bbcode\attribute\BBCodeAttribute;
  use wcf\system\exception\SystemException;
  use wcf\util\DOMUtil;
  use wcf\util\JSON;