David Yip a817f084ea

Merge remote-tracking branch 'tootsuite/master' ...

Conflicts:
 	app/controllers/statuses_controller.rb

2018-04-12 03:30:57 -05:00

..

_content_spoiler.html.haml

…

_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

Paginate ancestor statuses in public page (#7102)

2018-04-11 12:35:09 +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