Michael Telatynski 9cf162e267 Merge branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6 ...

 Conflicts:

	src/components/views/rooms/RoomSublist2.tsx

	src/components/views/rooms/RoomTile2.tsx

2020-07-03 00:02:37 +01:00

..

structures

Merge branch 'develop' into joriks/room-list-breadcrumbs

2020-07-02 13:22:51 -06:00

views

Merge branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6

2020-07-03 00:02:37 +01:00

_common.scss

Iterate PR based on Figma design and feedback

2020-07-01 13:59:50 +01:00

_components.scss

Implement breadcrumb notifications and scrolling

2020-06-30 23:24:46 +01:00

_font-sizes.scss

Use 10px instead

2020-06-04 16:23:28 +01:00

rethemendex.sh

Remove sort and include new scss file in components

2020-04-02 13:42:59 +01:00