David Yip ab04be2f84 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: config/i18n-tasks.yml		2018-03-18 20:21:17 -05:00
..
_content_spoiler.html.haml	Merge upstream!! #64 <3 <3	2017-07-12 02:03:17 -07:00
_detailed_status.html.haml	Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590)	2018-03-02 07:00:04 +01:00
_media.html.haml
_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	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00
_simple_status.html.haml	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-03-02 21:46:44 -06:00
_status.html.haml	Pinned statuses (#4675)	2017-08-25 01:41:18 +02:00
embed.html.haml	Update status embeds (#4742)	2017-08-30 10:23:43 +02:00
show.html.haml	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)	2018-03-18 20:33:07 +01:00