Michael Telatynski b7052a5c5f
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
2022-06-06 11:47:18 +01:00
..
2021-08-04 18:53:50 +01:00