Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor 2021-11-30 01:19:54 +00:00
commit 8be92d16fe
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 2 additions and 1 deletions

1
.gitattributes vendored
View File

@ -4,6 +4,7 @@
*.sh text eol=lf
*.txt text eol=lf
*.properties text eol=lf
*.neon text eol=lf
*.bat text eol=crlf
*.cmd text eol=crlf
*.ps1 text eol=crlf

@ -1 +1 @@
Subproject commit a59722c6764ce82e91a1ec2a9aa158e060022bed
Subproject commit bd329dba08242b6ecb99ef7fbf9a0031dcbbb3ff