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

Browse source

# Conflicts:
#	res/themes/light/css/_fonts.pcss
#	yarn.lock

...

This commit is contained in:

Michael Telatynski 2024-11-27 10:04:32 +00:00

parent 2c56e01400 af3a9777e8

commit 23c28a957c

No known key found for this signature in database

GPG key ID: A2B008A5F49F5D0D

32 changed files with 1127 additions and 425 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

res/fonts/Twemoji_Mozilla/TwemojiMozilla-sbix.woff2

View file

Binary file not shown.