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 1c9c0167b7 Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml		7 years ago
..
_content_spoiler.html.haml	…
_detailed_status.html.haml	…
_media.html.haml	…
_more.html.haml	…
_og_description.html.haml	…
_og_image.html.haml	…
_simple_status.html.haml	Merge branch 'master' into glitch-soc/master	7 years ago
_status.html.haml	…
embed.html.haml	…
show.html.haml	…