Merge remote-tracking branch 'refs/remotes/origin/3.0'
authorAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jan 2018 14:57:13 +0000 (15:57 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jan 2018 14:57:13 +0000 (15:57 +0100)
1  2 
wcfsetup/install/files/lib/data/package/update/PackageUpdateAction.class.php
wcfsetup/install/lang/de.xml
wcfsetup/install/lang/en.xml

index 17a1927b762f7f78bcb19d0d464fc7abca257f6b,4c6646445aceaba5262cf63ea4f9697c1b8903ab..83d90b4ba0b7e6fb074c5a3e58ac783f6baf1a79
@@@ -9,8 -9,8 +9,9 @@@ use wcf\data\search\Search
  use wcf\data\search\SearchEditor;
  use wcf\data\AbstractDatabaseObjectAction;
  use wcf\system\database\util\PreparedStatementConditionBuilder;
 +use wcf\system\exception\NamedUserException;
  use wcf\system\exception\PermissionDeniedException;
+ use wcf\system\exception\SystemException;
  use wcf\system\exception\UserInputException;
  use wcf\system\package\PackageInstallationScheduler;
  use wcf\system\package\PackageUpdateDispatcher;
Simple merge
Simple merge