mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

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

Browse source 
 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
commit b7052a5c5f
No known key found for this signature in database
GPG key ID: 98BC6A2B829297FE
53 changed files with 2539 additions and 1365 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -23,5 +23,6 @@ electron/pub
.vscode
.vscode/
.env
/coverage
/scripts/extracted/
/scripts/latest