Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-15 20:54:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
6e3c647109
element-web-Github/res
History
Michael Telatynski 6e3c647109 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 
 Conflicts:
	package.json
	src/components/views/spaces/SpacePanel.tsx
	src/i18n/strings/en_EN.json
	src/stores/SpaceStore.tsx
	yarn.lock
2021-06-22 21:15:53 +01:00
..
css Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282 2021-06-22 21:15:53 +01:00
fonts Update Inter font to v3.18 2021-04-09 17:41:54 +01:00
img Merge branch 'develop' into fix/mute-incoming-call/15591 2021-06-04 07:59:28 +02:00
media move default ringtones over from riot-web 2018-04-12 00:25:36 +01:00
themes Move and update variable usage 2021-05-05 14:00:56 -06:00