Merge branch '2.2' into 2.3

This commit is contained in:
Robbie Averill 2019-07-23 15:33:51 +02:00
commit 220e49271c

View File

@ -28,7 +28,7 @@ third party translation interface, transifex.com.
Newly added strings will be periodically uploaded there for translation, Newly added strings will be periodically uploaded there for translation,
and any new translations will be merged back to the project source code. and any new translations will be merged back to the project source code.
Please use [https://www.transifex.com/projects/p/silverstripe-translatable/](https://www.transifex.com/projects/p/silverstripe-translatable/) to contribute translations, Please use [https://www.transifex.com/silverstripe/silverstripe-translatable/](https://www.transifex.com/projects/p/silverstripe-translatable/) to contribute translations,
rather than sending pull requests with YAML files. rather than sending pull requests with YAML files.
See the ["i18n" topic](http://doc.silverstripe.org/framework/en/trunk/topics/i18n) on doc.silverstripe.org for more details. See the ["i18n" topic](https://docs.silverstripe.org/en/3/developer_guides/i18n/) on doc.silverstripe.org for more details.