Skip to content

Commit 4e11d16

Browse files
committed
Merge remote-tracking branch 'origin/develop' into chore/api-client
2 parents 58fd89a + 4391ca6 commit 4e11d16

File tree

619 files changed

+27343
-14635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

619 files changed

+27343
-14635
lines changed

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@
99
/_templates/ @RocketChat/chat-engine
1010
/apps/meteor/client/ @RocketChat/frontend
1111
/apps/meteor/tests/ @RocketChat/chat-engine
12+
/apps/meteor/app/apps/ @RocketChat/apps

.github/history-manual.json

+42
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,20 @@
124124
"pierre-lehnen-rc"
125125
]
126126
}],
127+
"3.18.6": [{
128+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
129+
"userLogin": "d-gubert",
130+
"contributors": [
131+
"ggazzo"
132+
]
133+
}],
134+
"3.18.7": [{
135+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
136+
"userLogin": "d-gubert",
137+
"contributors": [
138+
"ggazzo"
139+
]
140+
}],
127141
"4.1.1": [{
128142
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
129143
"userLogin": "sampaiodiego",
@@ -147,5 +161,33 @@
147161
"contributors": [
148162
"gronke"
149163
]
164+
}],
165+
"4.4.4": [{
166+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
167+
"userLogin": "d-gubert",
168+
"contributors": [
169+
"ggazzo"
170+
]
171+
}],
172+
"4.4.5": [{
173+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
174+
"userLogin": "d-gubert",
175+
"contributors": [
176+
"ggazzo"
177+
]
178+
}],
179+
"4.7.3": [{
180+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
181+
"userLogin": "d-gubert",
182+
"contributors": [
183+
"ggazzo"
184+
]
185+
}],
186+
"4.7.4": [{
187+
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
188+
"userLogin": "d-gubert",
189+
"contributors": [
190+
"ggazzo"
191+
]
150192
}]
151193
}

0 commit comments

Comments
 (0)