Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/stream_entries/_simple_status.html.haml - config/locales/nl.yml Deleted unused translation strings (themes) and adapted minor changes to _simple_status.html.haml		2018-08-31 19:10:57 +02:00
..
_detailed_status.html.haml	Fix autoplay issue with spoiler tag (#8540)	2018-08-31 15:16:59 +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-31 19:10:57 +02:00
_status.html.haml	Add animate custom emoji param to embed pages (#8507)	2018-08-30 23:14:01 +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	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00