11 commits

Author	SHA1	Message	Date
Jaiwanth	b04bfeda33	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations	2021-07-26 00:18:56 +05:30
Travis Ralston	3023fda497	Make MFileBody inherit the MediaBody styles	2021-07-21 14:46:25 -06:00
Šimon Brandner	e8760736ba	Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-21 15:33:06 +02:00
Jaiwanth	6dd3631a17	Delint	2021-07-21 11:48:37 +05:30
Jaiwanth	1ed316851a	Merge upstream and resolve conflicts	2021-07-21 11:35:27 +05:30
Travis Ralston	7892539a9b	delint	2021-07-20 09:03:26 -06:00
Travis Ralston	4d38218e24	Appease the linter	2021-07-16 16:11:27 -06:00
Travis Ralston	b57fff5739	Update visual style and sandbox properly	2021-07-16 15:55:07 -06:00
Travis Ralston	623f2e7613	Only show download link below media if it's not in the timeline	2021-07-16 15:12:36 -06:00
Travis Ralston	d156a56603	Share body prop types with an interface	2021-07-16 15:12:36 -06:00
Travis Ralston	ea7513fc16	Convert MFileBody to TS and use media helper	2021-07-16 15:12:36 -06:00

Renamed from src/components/views/messages/MFileBody.js (Browse further)