Travis Ralston d6cf2346fe Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240		2021-06-28 21:00:36 -06:00
..
_AudioPlayer.scss	Fix right panel sizing	2021-06-24 20:37:34 -06:00
_PlaybackContainer.scss	Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240	2021-06-28 21:00:36 -06:00
_PlayPauseButton.scss	Tile styling and early behaviour	2021-06-24 13:56:11 -06:00
_SeekBar.scss	I know how CSS works.	2021-06-25 00:22:05 -06:00
_Waveform.scss	Move voice message components to audio-generic directory	2021-06-24 11:38:35 -06:00