1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-31 13:44:28 +03:00
Files
matrix-react-sdk/playwright/plugins
Michael Telatynski 939147c6ad Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/es2022
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/EmbeddedPage.tsx
#	src/components/structures/FilePanel.tsx
#	src/components/structures/NotificationPanel.tsx
#	src/components/structures/RoomStatusBar.tsx
#	src/components/views/elements/AppTile.tsx
#	src/components/views/messages/EditHistoryMessage.tsx
#	src/components/views/messages/MessageActionBar.tsx
#	src/components/views/right_panel/TimelineCard.tsx
#	src/components/views/rooms/Autocomplete.tsx
#	src/components/views/rooms/EditMessageComposer.tsx
#	src/components/views/rooms/ReplyPreview.tsx
#	src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx
#	src/components/views/spaces/SpaceTreeLevel.tsx
2024-08-01 13:04:00 +01:00
..