Skip to content

Commit

Permalink
Merge branch '5.4' into 6.0
Browse files Browse the repository at this point in the history
* 5.4:
  fix merge
  [HttpClient] mark test transient
  [Mime] Fix test
  [Translation] Fix TranslationPullCommand with ICU translations
  [PropertyInfo] Fix phpstan extractor issues
  Allow package-versions-deprecated plugin
  Update security.lb.xlf
  [Notifier] Use correct factory for the msteams transport
  Fix SessionListener without session in request
  Remove direct dependency on composer/package-versions-deprecated
  Remove the unused dependency on composer/package-versions-deprecated
  [Security/Http] Fix cookie clearing on logout
  [HttpClient] fix checking for recent curl consts
  • Loading branch information
nicolas-grekas committed Dec 25, 2021
2 parents 5d9faf3 + f441101 commit 5a6afab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Transport.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use Symfony\Component\Notifier\Bridge\Mattermost\MattermostTransportFactory;
use Symfony\Component\Notifier\Bridge\MessageBird\MessageBirdTransportFactory;
use Symfony\Component\Notifier\Bridge\MessageMedia\MessageMediaTransportFactory;
use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransport;
use Symfony\Component\Notifier\Bridge\MicrosoftTeams\MicrosoftTeamsTransportFactory;
use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
Expand Down Expand Up @@ -81,7 +81,7 @@ final class Transport
MattermostTransportFactory::class,
MessageBirdTransportFactory::class,
MessageMediaTransportFactory::class,
MicrosoftTeamsTransport::class,
MicrosoftTeamsTransportFactory::class,
MobytTransportFactory::class,
OctopushTransportFactory::class,
OvhCloudTransportFactory::class,
Expand Down

0 comments on commit 5a6afab

Please sign in to comment.