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 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
_detailed_status.html.haml	Add missing video descriptions (#8416)	6 years ago
_og_description.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	6 years ago
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	6 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
_status.html.haml	Add "sign in to participate" message to public toot page (#8200)	6 years ago
embed.html.haml	Redesign public profiles and toots (#8068)	6 years ago
show.html.haml	Add remote interaction dialog for toots (#8202)	6 years ago