removed CHANGELOG for 2.0 as it is not maintained anymore
Merge branch '2.1' into 2.2

* 2.1:
  removed CHANGELOG for 2.0 as it is not maintained anymore

Conflicts:
	CHANGELOG-2.0.md
Merge branch '2.2'

* 2.2:
  removed CHANGELOG for 2.0 as it is not maintained anymore
updated version to 2.4
Revert "merged branch armetiz/master (PR #8045)"

This reverts commit a6dd5db60d1eb56be917fcc38244bcca168740a9, reversing
changes made to da6f190a6b630d6fc17729e04061308e573b47c7.
adding missing Farsi translations
merged branch empire/patch-validator-fa (PR #8060)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8060).

Discussion
----------

[Validator] added missing Farsi translations

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT

Farsi translations for the following validators

-  IBAN
-  ISBN
-  ISSN
-  Currency
-  EqualTo
-  IdenticalTo
-  NotEqualTo
-  NotIdenticalTo
-  GreaterThan
-  GreaterThanOrEqual
-  LessThan
-  LessThanOrEqual;

Commits
-------

026f2ac [Validator] adding missing Farsi translations
remove check for PHP bug #50731
merged branch xabbuh/issue8007-master (PR #8052)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8052).

Discussion
----------

remove check for PHP bug #50731

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8007
| License       | MIT
| Doc PR        |

Commits
-------

28534a6 remove check for PHP bug #50731
Update validators.ru.xlf

[Validator] russian language update
merged branch vitaliytv/patch-2 (PR #8055)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8055).

Discussion
----------

[Validator] Update validators.ru.xlf

russian language update

Commits
-------

bbfdd15 Update validators.ru.xlf
Bumped Icu dependency to RC
merged branch bschussek/intl-fix (PR #8057)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8057).

Discussion
----------

[Intl] Bumped Icu dependency to RC

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8035
| License       | MIT
| Doc PR        | -

Commits
-------

2ce5aa4 [Intl] Bumped Icu dependency to RC
Added missing column to the form's table layout
merged branch bschussek/table-layout-fix (PR #8059)

This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8059).

Discussion
----------

[TwigBridge] Added missing column to the form's table layout

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

97f3669 [TwigBridge] Added missing column to the form's table layout
Merge branch '2.3'

* 2.3:
  Added missing column to the form's table layout
  Bumped Icu dependency to RC
  Update validators.ru.xlf
  remove check for PHP bug #50731
  adding missing Farsi translations
  Revert "merged branch armetiz/master (PR #8045)"