You've already forked matrix-react-sdk
							
							
				mirror of
				https://github.com/matrix-org/matrix-react-sdk.git
				synced 2025-10-31 01:45:39 +03:00 
			
		
		
		
	Merge branch 'develop' into sort-imports
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
		| @@ -35,7 +35,7 @@ import ResizeNotifier from '../../utils/ResizeNotifier'; | ||||
| import TimelinePanel from "./TimelinePanel"; | ||||
| import Spinner from "../views/elements/Spinner"; | ||||
| import { TileShape } from '../views/rooms/EventTile'; | ||||
| import { Layout } from "../../settings/Layout"; | ||||
| import { Layout } from "../../settings/enums/Layout"; | ||||
| import RoomContext, { TimelineRenderingType } from '../../contexts/RoomContext'; | ||||
|  | ||||
| interface IProps { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user