Merge branch 'master' into remake-traces

settings/l10n/.tx/config

@@ -7,3 +7,4 @@ minimum_perc = 0
 source_file = template.pot
 source_lang = en
 type = PO
+

settings/pkg/util/resource_helper_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/owncloud/ocis/settings/pkg/proto/v0"
-	"gotest.tools/assert"
+	"gotest.tools/v3/assert"
 )
 
 func TestIsResourceMatched(t *testing.T) {

settings/yarn.lock

@@ -3778,7 +3778,7 @@ gherkin@5.0.0:
   integrity sha1-lt70EZjsOQgli1Ea909lWidk0qE=
 
 glob-parent@^5.0.0, glob-parent@~5.1.0:
-  version "5.1.1"
+  version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
@@ -5925,7 +5925,7 @@ path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
+  version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
@@ -7487,7 +7487,7 @@ tar-stream@^2.2.0:
     readable-stream "^3.1.1"
 
 tar@^6.0.2, tar@^6.1.0:
-  version "6.1.0"
+  version "6.1.6"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83"
   integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==
   dependencies: