Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into brea…

…k/blockstack-removal
RocketChat · Jun 6, 2022 · cc6e19d · cc6e19d
2 parents 2be6f86 + 881e762
commit cc6e19d
Show file tree

Hide file tree

Showing 309 changed files with 21,065 additions and 10,436 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,3 +9,4 @@
 /_templates/ @RocketChat/chat-engine
 /apps/meteor/client/ @RocketChat/frontend
 /apps/meteor/tests/ @RocketChat/chat-engine
+/apps/meteor/app/apps/ @RocketChat/apps
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"
+		]
 	}]
 }