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.		2018-08-26 14:23:24 +02:00
..
_detailed_status.html.haml	Add missing video descriptions (#8416)	2018-08-24 23:55:41 +02:00
_og_description.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-26 14:23:24 +02:00
_status.html.haml	Add "sign in to participate" message to public toot page (#8200)	2018-08-18 12:48:27 +02:00
embed.html.haml	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00
show.html.haml	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00