4 Commits (046b3f325c79eca455c0780331e8b44a90d3bc28)

Author	SHA1	Message	Date
Travis Ralston	d6cf2346fe	Manually conflict resolve https://github.com/matrix-org/matrix-react-sdk/pull/6240	2021-06-28 21:00:36 -06:00
Travis Ralston	ffef2e58cb	Unify audio message types to new media body	2021-06-24 11:38:35 -06:00
Travis Ralston	8ce77e618f	Reduce pointless CSS vars by 2	2021-06-24 11:38:35 -06:00
Travis Ralston	470778cbb8	Move voice message components to audio-generic directory	2021-06-24 11:38:35 -06:00