Commit 0500c8d
committed
Merge branch '6.4' into 7.0
* 6.4: (23 commits)
update conflict rules
update translation fr
prevent incompatible Translator implementations to be used
[Validator] added missing Serbian Latin translation
[Validator] added missing Czech translations
[Validator] added missing Portuguese translation
[Validator] added missing Luxembourgish translation
[Validator] added missing Greek translations
[Validator] added missing Azerbaijani translations
[Validator] added missing Slovenian translations
[Validator] added missing Bulgarian translations
[Validator] added missing Turkish translations
[Validator] added missing Russian translations
[Validator] added missing Danish translations
[Notifier] Fix FrameworkExtension factory classes (MessageBird & TurboSms)
[Validator] added missing Macedonian translation
[Validator] added missing Slovak translations
[Form][Security][Validator] Normalize translation files
[Console] CS fix
Add missing Indonesian translation
...1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2725 | 2725 | | |
2726 | 2726 | | |
2727 | 2727 | | |
2728 | | - | |
| 2728 | + | |
2729 | 2729 | | |
2730 | 2730 | | |
2731 | 2731 | | |
| |||
2755 | 2755 | | |
2756 | 2756 | | |
2757 | 2757 | | |
2758 | | - | |
| 2758 | + | |
2759 | 2759 | | |
2760 | 2760 | | |
2761 | 2761 | | |
| |||
0 commit comments