Merge pull request RocketChat#970 from WideChat/develop_pwa-catchup-a…

…ccdbc6 [Upstream Catchup] Merge RC:master to develop_pwa
bhardwajaditya · Oct 19, 2021 · 672a23a · 672a23a
2 parents f14ef27 + 500dcbb
commit 672a23a
Show file tree

Hide file tree

Showing 1,202 changed files with 20,044 additions and 21,039 deletions.
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.18.1
+ENV RC_VERSION 4.0.3
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -115,5 +115,13 @@
 			"matheusbsilva137",
 			"pierre-lehnen-rc"
 		]
+	}],
+	"3.18.2": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego",
+			"pierre-lehnen-rc"
+		]
 	}]
 }