Skip to content

Commit c0efe2a

Browse files
committed
Merge branch '5.x' into 6.x
2 parents 042d10c + 31d61c6 commit c0efe2a

30 files changed

Lines changed: 261 additions & 130 deletions

.tools/psalm/baseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -784,7 +784,6 @@
784784
</file>
785785
<file src="pages/mailer/checkmail.php">
786786
<MixedArgument>
787-
<code><![CDATA[$str]]></code>
788787
<code><![CDATA[Core::getConfig('phpmailer_test_address')]]></code>
789788
</MixedArgument>
790789
<MixedAssignment>
-48 Bytes
Loading
8 Bytes
Loading
7 Bytes
Loading
-772 Bytes
Loading
-1.56 KB
Loading
9 Bytes
Loading
6 Bytes
Loading
0 Bytes
Loading
0 Bytes
Loading

0 commit comments

Comments
 (0)