mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-17 05:41:45 +03:00
8f4879ea96
Conflicts: src/components/structures/MessagePanel.tsx src/components/structures/ScrollPanel.tsx src/components/structures/TimelinePanel.tsx src/components/views/elements/ErrorBoundary.tsx src/components/views/elements/EventListSummary.tsx src/components/views/messages/TileErrorBoundary.tsx |
||
---|---|---|
.. | ||
DateSeparator.tsx | ||
EditHistoryMessage.js | ||
EncryptionEvent.tsx | ||
EventTileBubble.tsx | ||
MAudioBody.js | ||
MessageActionBar.js | ||
MessageEvent.js | ||
MessageTimestamp.tsx | ||
MFileBody.js | ||
MImageBody.js | ||
MJitsiWidgetEvent.tsx | ||
MjolnirBody.js | ||
MKeyVerificationConclusion.js | ||
MKeyVerificationRequest.tsx | ||
MStickerBody.js | ||
MVideoBody.tsx | ||
MVoiceMessageBody.tsx | ||
MVoiceOrAudioBody.tsx | ||
ReactionsRow.tsx | ||
ReactionsRowButton.tsx | ||
ReactionsRowButtonTooltip.tsx | ||
RedactedBody.tsx | ||
RoomAvatarEvent.js | ||
RoomCreate.js | ||
SenderProfile.tsx | ||
TextualBody.js | ||
TextualEvent.js | ||
TileErrorBoundary.tsx | ||
UnknownBody.js | ||
ViewSourceEvent.js |