Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ci3

 Conflicts:
	.editorconfig
	.github/workflows/preview_changelog.yaml
	.github/workflows/static_analysis.yaml
	.github/workflows/triage-labelled.yml
	.github/workflows/triage-priority-bugs.yml
	.gitignore
	scripts/layered.sh
This commit is contained in:
Michael Telatynski
2022-06-06 11:47:18 +01:00
53 changed files with 2539 additions and 1365 deletions
+1
View File
@@ -23,5 +23,6 @@ electron/pub
.vscode
.vscode/
.env
/coverage
/scripts/extracted/
/scripts/latest