Commit fc64be7
committed
Merge branch 'master' into 3.2-merge
# Conflicts:
# .github/workflows/test.yml
# src/command/composer.json
# src/serializer/src/Contract/CacheableSupportsMethodInterface.php
# src/validation/src/ValidationRuleParser.php2 files changed
Lines changed: 2 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
25 | | - | |
| 25 | + | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
| |||
0 commit comments