From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Thu, 28 Jul 2022 09:38:53 +0000 (+0200)
Subject: Merge branch '5.5'
X-Git-Tag: 6.0.0_Alpha_1~1097
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=488fc1afe33b536997a4b1248a7a51977cecdb64;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '5.5'
---

488fc1afe33b536997a4b1248a7a51977cecdb64
diff --cc wcfsetup/install/files/lib/system/api/composer/installed.php
index d88be72e39,f56a67e3a8..8104d2170e
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@@ -92,12 -92,14 +92,14 @@@
              'dev_requirement' => false,
          ),
          'laminas/laminas-progressbar' => array(
 -            'pretty_version' => 'dev-woltlab-2.7',
 -            'version' => 'dev-woltlab-2.7',
 -            'reference' => '3c61cf5698fe537a0cd1984d0d711bb98b2babde',
 +            'pretty_version' => '2.10.1',
 +            'version' => '2.10.1.0',
 +            'reference' => 'cb57c459f3c2cef516e6d36218b70f780289d383',
              'type' => 'library',
              'install_path' => __DIR__ . '/../laminas/laminas-progressbar',
-             'aliases' => array(),
+             'aliases' => array(
+                 0 => '2.7.0',
+             ),
              'dev_requirement' => false,
          ),
          'laminas/laminas-stdlib' => array(