Michael Telatynski 1286be1ffb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 ... Conflicts: src/components/views/room_settings/AliasSettings.tsx		2021-06-22 22:02:09 +01:00
..
betas	Update spaces.png	2021-05-13 15:24:47 +01:00
e2e	Update e2e iconography	2020-09-08 15:42:31 +01:00
element-icons	Switch Space Settings for a tabbed view with a bunch more settings exposed	2021-06-08 16:33:47 +01:00
emojipicker	Split inline SVGs to their own files	2019-10-20 12:13:32 +03:00
feather-customised	Remove now-unused assets and CSS from CompleteSecurity step	2021-03-12 15:24:16 -07:00
format	…
image-view	Fix close icon	2021-02-25 08:10:54 +01:00
social	…
voip	Add icons for silencing	2021-05-22 20:23:07 +02:00
camera.svg	…
cancel-red.svg	…
cancel-small.svg	…
cancel.svg	…
download.svg	…
element-desktop-logo.svg	Add a note to use the desktop builds when seshat isn't available	2020-09-16 17:23:37 -06:00
ellipsis.svg	…
ems-logo.svg	Swap out Modular for EMS	2020-07-14 15:47:03 -06:00
external-link.svg	…
fileicon.png	move non-Riot image resources over from riot-web	2018-04-12 00:25:07 +01:00
globe.svg	Switch out the globe icon and colour it depending on theme	2020-08-13 15:16:31 +01:00
icon-address-delete.svg	…
icon-context-mute-mentions.svg	…
icon-context-mute-off-copy.svg	…
icon-context-mute-off.svg	move non-Riot image resources over from riot-web	2018-04-12 00:25:07 +01:00
icon-context-mute.svg	…
icon-email-pill-avatar.svg	Make the SVG smaller	2020-01-09 13:40:35 -07:00
icon-email-user.svg	…
icon-invite-people.svg	one big commit, sorry	2018-10-24 13:50:58 +02:00
icon-pill-remove.svg	Make the SVG smaller	2020-01-09 13:38:47 -07:00
icon-return.svg	…
icon_context_delete.svg	…
icon_context_fave.svg	new icons	2018-10-23 18:09:21 +02:00
icon_context_fave_on.svg	…
icon_context_low.svg	…
icon_context_low_on.svg	…
icon_context_person.svg	…
icon_context_person_on.svg	…
icons-close.svg	…
icons-create-room.svg	…
icons-directory.svg	…
icons-groups.svg	…
icons-people.svg	new icons	2018-10-23 18:09:21 +02:00
icons-room-add.svg	…
icons-show-stickers.svg	…
markdown.svg	…
matrix-org-bw-logo.svg	…
member_chevron.png	move non-Riot image resources over from riot-web	2018-04-12 00:25:07 +01:00
minimise.svg	…
notif-active.svg	…
notif-slider.svg	…
plus.svg	…
room_replaced.svg	Forgot the image file	2018-08-21 17:56:28 +01:00
search-icon-vector.svg	…
spinner.svg	Vectorize spinners	2021-02-23 20:22:09 -05:00
stickerpack-placeholder.png	…
tick.svg	…
typing-indicator-2x.gif	…
upload-big.svg	Use new upload icon	2021-02-25 18:46:48 +01:00
warning.svg	…