Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
_attachment_list.html.haml	Add attachment list fallback to public pages (#9780)	2019-01-13 09:23:54 +00:00
_detailed_status.html.haml	Add blurhash (#10630)	2019-04-27 03:24:09 +02:00
_og_description.html.haml	Add description meta tag additionally to og:description (#8941)	2018-10-10 02:21:30 +02:00
_og_image.html.haml	Add admin setting to enable OG previews for sensitive media (#7962)	2018-07-06 02:15:56 +02:00
_poll.html.haml	Add support for custom emojis in poll options (#10322)	2019-03-20 17:29:12 +01:00
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
_status.html.haml	Revert Font Awesome 5 upgrade (#8810)	2018-09-28 02:11:14 +02:00
embed.html.haml	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +02:00
show.html.haml	Fix og:url on toots' public view (#9047)	2018-10-21 22:52:10 +02:00