Merge branch 'PR-Branch' of github.com:nofficalfs/noname into PR-Branch

.eslintrc.json

@@ -11,7 +11,6 @@
         "no-unused-vars": 0,
         "no-undef": 0,
         "no-redeclare": 0,
-        "no-prototype-builtins": 0,
         "require-yield": 0,
         "no-irregular-whitespace": ["error", { "skipStrings": true, "skipTemplates": true }],
         "no-constant-condition": ["error", { "checkLoops": false }]/* ,

.gitignore

@@ -6,4 +6,4 @@
 ehthumbs.db
 Thumbs.db
 localStorage.json
-.vscode/*
+.vscode