Merge branch 'stable' into master

Browse Source

...

This commit is contained in:

Dylan K. Taylor

2020-08-15 20:32:14 +01:00

parent ec1adb5886 9a0f723dff

commit a35ca1fa71

8 changed files with 135 additions and 51 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2

resources/vanilla

Submodule resources/vanilla updated: 767676e2b9...afc885ccca