Merge branch 'master' into 3717-fix-qq-blocked

AdguardTeam · Mar 7, 2022 · ded9842 · ded9842
2 parents ef80c07 + 89d9b03
commit ded9842
Show file tree

Hide file tree

Showing 232 changed files with 12,717 additions and 8,073 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,5 @@
 client/* linguist-vendored
+# This file contains a lot of inline SVG data, which often interferes with
+# grepping.  Technically, this file must be reviewed when new icons appear, but
+# that happens fairly rarely.
+client/src/components/ui/Icons.js -diff
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 'name': 'build'
 
 'env':
-  'GO_VERSION': '1.16'
+  'GO_VERSION': '1.17'
   'NODE_VERSION': '14'
 
 'on':

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 'name': 'lint'
 
 'env':
-  'GO_VERSION': '1.16'
+  'GO_VERSION': '1.17'
 
 'on':
   'push':

diff --git a/.twosky.json b/.twosky.json
@@ -12,6 +12,7 @@
       "en": "English",
       "es": "Español",
       "fa": "فارسی",
+      "fi": "Suomi",
       "fr": "Français",
       "hr": "Hrvatski",
       "hu": "Magyar",
@@ -33,6 +34,7 @@
       "sv": "Svenska",
       "th": "ภาษาไทย",
       "tr": "Türkçe",
+      "uk": "Українська",
       "vi": "Tiếng Việt",
       "zh-cn": "简体中文",
       "zh-hk": "繁體中文（香港）",