mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 12:51:32 +03:00
Code Issues Projects Releases Packages Wiki Activity
element-web/src/i18n
History
nurjinn jafar 1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
2020-08-25 11:52:48 +02:00
..
strings Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-08-25 11:52:48 +02:00