Merge branch 'general-devel' into h/ips

This commit is contained in:
Lucas Nicodemus 2021-05-28 19:43:16 -07:00
commit d8512b842c

1
.gitattributes vendored
View file

@ -3,3 +3,4 @@
*.sln text eol=crlf
*.csproj text eol=crlf
*.vsmdi text eol=crlf
CHANGELOG.md merge=union