Merge branch 'develop' into pr/Antreasgr/4838

2021-05-27 14:58:19 +02:00
parent 3014bc3467 cf39dd2163
commit a89364aa98
95 changed files with 2815 additions and 1369 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
-*       encoding=UTF-8
 *.py    eol=lf
 *.sh    eol=lf
 *.ps1   eol=crlf