Merge branch 'master' into 1.5.0

This commit is contained in:
Tyler Murphy 2022-06-01 20:01:03 -04:00 committed by GitHub
commit eae906317c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,3 @@
## Contributing Guidelines
- Do not send any pull requests to the master branch - Do not send any pull requests to the master branch
- Any pull requests sent to master will be closed - Any pull requests sent to master will be closed
- Send pull requests to the current beta branch (usually named as an unreleased version) - Send pull requests to the current beta branch (usually named as an unreleased version)
@ -11,4 +9,4 @@
- If making a new language file, follow the local naming convention - If making a new language file, follow the local naming convention
- localization-[LANGUAGE](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes#)_[TERRITORY](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements).yml. You can find the 2-letter codes in the links. - localization-[LANGUAGE](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes#)_[TERRITORY](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Officially_assigned_code_elements).yml. You can find the 2-letter codes in the links.
- Common sense, please... - Common sense, please...
- File subject to change in the future - File subject to change in the future