Merge branch 'develop' into improve/otr-message

RocketChat · Feb 22, 2022 · a25f992 · a25f992
2 parents 87c2355 + 7346a70
commit a25f992
Show file tree

Hide file tree

Showing 351 changed files with 6,306 additions and 4,782 deletions.
diff --git a/.github/pr-title-checker-config.json b/.github/pr-title-checker-config.json
@@ -4,7 +4,7 @@
 		"color": "B60205"
 	},
 	"CHECKS": {
-		"regexp": "^(?:(?:\\[(NEW|BREAK|IMPROVE|FIX)\\](\\[(ENTERPRISE|APPS)\\])?|(?:Regression|Chore|Revert|i18n):)|(?:Bump) .+|Release [0-9]+\\.[0-9]+\\.[0-9]+|Merge master into develop)",
+		"regexp": "^(?:(?:\\[(NEW|BREAK|IMPROVE|FIX)\\](\\[(ENTERPRISE|APPS)\\])?|(?:Regression|Chore|Revert|i18n):)|(?:Bump)) .+$|^Release [0-9]+\\.[0-9]+\\.[0-9]+$|^Merge master into develop",
 		"ignoreLabels" : ["[ignore-title]"]
 	}
 }