Merge branch 'develop_pwa' of https://github.com/WideChat/Rocket.Chat …

…into push_notification_subscription_handle

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.5.3
+ENV RC_VERSION 3.6.0
 
 MAINTAINER buildmaster@rocket.chat
 

.eslintrc

@@ -73,12 +73,15 @@
         "@typescript-eslint"
       ],
       "rules": {
+        "func-call-spacing": "off",
         "jsx-quotes": [
           "error",
           "prefer-single"
         ],
         "indent": "off",
         "no-extra-parens": "off",
+        "no-spaced-func": "off",
+        "no-useless-constructor": "off",
         "react/jsx-uses-react": "error",
         "react/jsx-uses-vars": "error",
         "react/jsx-no-undef": "error",

.github/history-manual.json

@@ -21,5 +21,12 @@
 		"title": "[BREAK] TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`",
 		"userLogin": "sampaiodiego",
 		"contributors": []
+	}],
+	"3.6.0-rc.0": [{
+		"pr": "18642",
+		"title": "[NEW] Admin option to reset other users’ E2E encryption key",
+		"userLogin": "rodrigok",
+		"contributors": [],
+		"description": "Requires the 2FA password fallback enforcement enabled to work"
 	}]
 }