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
element-icons	Switch Space Settings for a tabbed view with a bunch more settings exposed	2021-06-08 16:33:47 +01:00
emojipicker
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
ellipsis.svg
ems-logo.svg
external-link.svg
fileicon.png
globe.svg
icon-address-delete.svg
icon-context-mute-mentions.svg
icon-context-mute-off-copy.svg
icon-context-mute-off.svg
icon-context-mute.svg
icon-email-pill-avatar.svg
icon-email-user.svg
icon-invite-people.svg
icon-pill-remove.svg
icon-return.svg
icon_context_delete.svg
icon_context_fave.svg
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
icons-room-add.svg
icons-show-stickers.svg
markdown.svg
matrix-org-bw-logo.svg
member_chevron.png
minimise.svg
notif-active.svg
notif-slider.svg
plus.svg
room_replaced.svg
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