Merge pull request RocketChat#545 from WideChat/develop_pwa-catchup-7…

…551a16 [Upstream Catchup] Merge RC:master to develop_pwa
Shailesh351 · Mar 4, 2021 · c049b67 · c049b67
2 parents ba8f43a + 4f2b6cc
commit c049b67
Show file tree

Hide file tree

Showing 303 changed files with 14,612 additions and 6,958 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.11.1
+ENV RC_VERSION 3.12.0
 
 MAINTAINER [email protected]
 

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -56,5 +56,12 @@
 		"contributors": [
 			"sampaiodiego"
 		]
+	}],
+	"3.12.0-rc.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
 	}]
 }