Merge branch 'master' into dev

This commit is contained in:
David Reid
2020-12-31 08:12:21 +10:00
+4 -2
View File
@@ -10,5 +10,7 @@ if you do any of the following:
* Include a dependency on an external library
* Include copyrighted code
Your pull request may still be rejected for other reasons to those listed above, but we will inform you of
the reasons.
Your pull request may still be rejected for other reasons to those listed above, but you will be informed
of the reasons.
Please base your branch off the `dev` branch.