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	Merge upstream!! #64 <3 <3	7 years ago
_detailed_status.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
_media.html.haml	Images now behind CWs on static pages	8 years ago
_more.html.haml	Paginate descendant statuses in public page (#7148)	7 years ago
_og_description.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago
_og_image.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/master	7 years ago
_status.html.haml	Enable custom emojis in profiles (notes, field values, display names) (#7374)	7 years ago
embed.html.haml	Update status embeds (#4742)	7 years ago
show.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	7 years ago