matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-12 12:41:46 +03:00
Code Activity

Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8

Browse Source 
 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
This commit is contained in:
Michael Telatynski
2021-06-29 22:14:40 +01:00
parent 623317cd47 9d6d8fc666
commit 8f4879ea96
638 changed files with 3442 additions and 4515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/MessagePanel.tsx
View File

@ -432,7 +432,7 @@ export default class MessagePanel extends React.Component<IProps, IState> {
// confused.
if (visible) {
hr = <hr className="mx_RoomView_myReadMarker"
style={{opacity: 1, width: '99%'}}
style={{ opacity: 1, width: '99%' }}
/>;
}