Skip to content

Commit e3d9994

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Tests] Remove some unused fixtures added missing translations for portuguese [#43726] [HttpClient][Mime] Add correct IDN flags for IDNA2008 compliance properly parse quoted strings tagged with !!str do not merge label classes into expanded choice labels [Serializer] PropertyNormalizer - return unique (i.e. filter duplicate ) attributes in extractAttributes function
2 parents c0651c9 + f463eb8 commit e3d9994

File tree

4 files changed

+0
-18
lines changed

4 files changed

+0
-18
lines changed

Tests/Fixtures/BaseBundle/BaseBundle.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

Tests/Fixtures/BaseBundle/Resources/views/base.format.engine

Whitespace-only changes.

Tests/Fixtures/BaseBundle/Resources/views/controller/base.format.engine

Whitespace-only changes.

Tests/Fixtures/BaseBundle/Resources/views/this.is.a.template.format.engine

Whitespace-only changes.

0 commit comments

Comments
 (0)