Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
_attachment_list.html.haml
_detailed_status.html.haml
_og_description.html.haml
_og_image.html.haml
_poll.html.haml
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
_status.html.haml
embed.html.haml
show.html.haml