Michael Telatynski c784039cf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets ...

 Conflicts:

	src/components/views/right_panel/WidgetCard.tsx

	src/stores/WidgetStore.ts

2020-10-07 10:04:45 +01:00

..

structures

Fix room directory clipping links in the room's topic

2020-10-02 18:00:58 +02:00

views

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

2020-10-07 10:04:45 +01:00

_common.scss

Make the hover transition a variable

2020-09-24 08:23:06 -06:00

_components.scss

Merge branch 'develop' into travis/ft-sep1620/03-jitsi-obvious

2020-09-28 13:41:48 -06:00

_font-sizes.scss

Use rem to guard against font scaling breakages

2020-07-16 20:15:28 +05:30

_font-weights.scss

Iterate PR, tweak margins

2020-08-18 12:00:56 +01:00

rethemendex.sh

…