Merge remote-tracking branch 'origin/v3.4' into dev

This commit is contained in:
proddy
2022-01-23 17:56:52 +01:00
parent 02e2b51814
commit 77e1898512
538 changed files with 32278 additions and 38651 deletions
+1 -1
View File
@@ -3,6 +3,6 @@
"semi": false,
"trailingComma": "all",
"tabWidth": 2,
"printWidth": 80
"printWidth": 120
}