mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-11-29 21:59:40 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/res
History
Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
..
css Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180 2020-09-17 13:42:27 +01:00
fonts
img
media
themes