Files
element-web/src
Michael Telatynski a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-16 16:09:08 +01:00
..
2020-09-08 15:43:38 +01:00
2020-07-20 20:43:55 +01:00
2020-07-20 20:43:55 +01:00
2020-09-08 13:00:00 +03:00
2020-07-21 17:57:08 +01:00
2020-08-29 12:14:16 +01:00
2020-07-14 20:36:27 +02:00
2020-09-11 13:02:02 +01:00
2020-07-17 16:03:07 +01:00
2020-09-11 21:09:42 -06:00
2020-08-28 18:53:43 +01:00
2020-07-20 20:43:55 +01:00
2020-08-31 11:07:29 -06:00
2020-09-11 10:17:37 +01:00