Commit a4967cce authored by David Reid's avatar David Reid

Merge branch 'master' into dev

parents d533bb45 24ed1dd9
...@@ -10,5 +10,7 @@ if you do any of the following: ...@@ -10,5 +10,7 @@ if you do any of the following:
* Include a dependency on an external library * Include a dependency on an external library
* Include copyrighted code * Include copyrighted code
Your pull request may still be rejected for other reasons to those listed above, but we will inform you of Your pull request may still be rejected for other reasons to those listed above, but you will be informed
the reasons. of the reasons.
\ No newline at end of file
Please base your branch off the `dev` branch.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment