element-web/src/i18n
Michael Telatynski a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3
 Conflicts:
	src/components/structures/LoggedInView.js
2020-03-20 16:10:27 +00:00
..
strings Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 2020-03-20 16:10:27 +00:00