Skip to content

Commit

Permalink
Merge pull request RocketChat#825 from WideChat/develop_pwa-catchup-e…
Browse files Browse the repository at this point in the history
…178a9a

[Upstream Catchup] Merge RC:master to develop_pwa
  • Loading branch information
ear-dev authored Jul 15, 2021
2 parents 9ca0156 + aae9c12 commit 02f9fe3
Show file tree
Hide file tree
Showing 419 changed files with 12,428 additions and 6,430 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12

ENV RC_VERSION 3.15.0
ENV RC_VERSION 3.16.2

MAINTAINER [email protected]

Expand Down
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@
],
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-unused-vars": ["error", {
"argsIgnorePattern": "^_"
"argsIgnorePattern": "^_",
"ignoreRestSiblings": true
}]
},
"env": {
Expand Down
Loading

0 comments on commit 02f9fe3

Please sign in to comment.