Merge branch 'develop' into jb-convert-client-sidebar

RocketChat · Jun 1, 2022 · 1d185dc · 1d185dc
2 parents d16f20f + 6b41aa6
commit 1d185dc
Show file tree

Hide file tree

Showing 158 changed files with 15,682 additions and 1,986 deletions.
diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -124,6 +124,20 @@
 			"pierre-lehnen-rc"
 		]
 	}],
+	"3.18.6": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
+	}],
+	"3.18.7": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
+	}],
 	"4.1.1": [{
 		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
 		"userLogin": "sampaiodiego",
@@ -147,5 +161,33 @@
 		"contributors": [
 			"gronke"
 		]
+	}],
+	"4.4.4": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
+	}],
+	"4.4.5": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
+	}],
+	"4.7.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
+	}],
+	"4.7.4": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "d-gubert",
+		"contributors": [
+			"ggazzo"
+		]
 	}]
 }