You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		6 years ago
..
_attachment_list.html.haml	…
_detailed_status.html.haml	…
_og_description.html.haml	Add description meta tag additionally to og:description (#8941)	6 years ago
_og_image.html.haml	…
_poll.html.haml	…
_simple_status.html.haml	…
_status.html.haml	…
embed.html.haml	…
show.html.haml	…