element-web-Github/res/css/views
Michael Telatynski a688e5b8b3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
 Conflicts:
	src/components/structures/LoggedInView.tsx
	src/stores/SpaceStore.tsx
2021-09-06 11:41:09 +01:00
..
audio_messages $tertiary-fg-color -> $tertiary-content 2021-08-12 17:19:29 +02:00
auth $primary-bg-color -> $background 2021-08-12 17:17:34 +02:00
avatars Revert "$avatar-bg-color -> $background" 2021-08-24 09:04:17 +02:00
beta Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-06 11:41:09 +01:00
context_menus $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
dialogs $tertiary-fg-color -> $tertiary-content 2021-08-12 17:19:29 +02:00
directory $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
elements Fixed eslint error and copyright header 2021-08-28 13:56:08 +02:00
emojipicker $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
groups $primary-fg-color -> $primary-content 2021-08-12 17:18:18 +02:00
messages Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-25 08:53:16 +01:00
right_panel Merge branch 'develop' into gsouquet/threaded-messaging-2349 2021-08-25 08:53:16 +01:00
room_settings
rooms Merge pull request #6582 from SimonBrandner/fix/bubble-highlight/18295 2021-09-06 09:56:16 +01:00
settings Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 2021-09-06 11:41:09 +01:00
spaces Remove line of unknown origin 2021-08-24 08:59:12 +02:00
terms
toasts Merge remote-tracking branch 'upstream/develop' into task/colors-2 2021-08-24 08:57:12 +02:00
verification
voip Merge pull request #6639 from SimonBrandner/feature/voice-activity 2021-08-25 09:16:37 -06:00