Michael Telatynski 70c81cc377 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs ... Conflicts: src/i18n/strings/en_EN.json src/rageshake/submit-rageshake.ts		2020-07-21 22:22:28 +01:00
..
auth	Swap out Modular for EMS	2020-07-14 15:47:03 -06:00
avatars	Fix Room Tile Icon to not ignore DMs in other tags	2020-07-16 12:33:05 +01:00
context_menus	A visit from the lint bunny	2020-07-15 10:51:57 +01:00
create_room	Remove core structures for the old room list	2020-07-17 14:17:11 -06:00
dialogs	Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs	2020-07-21 22:22:28 +01:00
directory	Fix missed copy	2020-03-16 12:28:20 +00:00
elements	Merge remote-tracking branch 'origin' into joriks/eslint-config	2020-07-21 15:32:50 +01:00
emojipicker	Stop removing variation selector from quick reactions	2020-06-04 18:58:13 +03:00
groups	delint	2020-07-20 14:56:47 +01:00
messages	Merge pull request #5029 from uhoreg/sanitize_language	2020-07-21 13:12:51 -04:00
right_panel	delint	2020-07-17 19:25:37 +01:00
room_settings	Use new eslint package- fix lint issues in ts and js	2020-06-23 17:01:19 +01:00
rooms	Support custom tags in the room list again	2020-07-20 16:51:16 -06:00
settings	Rename RoomListStore file	2020-07-17 15:11:34 -06:00
terms	Fix indentation	2020-07-16 18:12:11 +05:30
toasts	Transition languageHandler to Typescript	2020-07-02 23:15:08 +01:00
verification	Provide separate translatable for case where we have no device	2020-05-12 12:42:16 +01:00
voip	Add min-width to floating Jitsi	2020-07-20 15:15:21 +01:00