David Yip 3d033a4687 Merge remote-tracking branch 'tootsuite/master' into merge-upstream ...

Conflicts:
	Gemfile
	config/locales/simple_form.pl.yml

2018-02-17 00:02:37 -06:00

..

_content_spoiler.html.haml

…

_detailed_status.html.haml

Add preference to always display sensitive media (#6448)

2018-02-09 00:26:57 +01:00

_media.html.haml

…

_og_description.html.haml

Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)

2018-02-16 04:40:53 +01:00

_og_image.html.haml

Save video metadata and improve video OpenGraph tags (#6481)

2018-02-16 07:22:20 +01:00

_simple_status.html.haml

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-02-09 09:25:53 -06:00

_status.html.haml

…

embed.html.haml

…

show.html.haml

Fix #6204: Use content warning for page title when present (#6231)

2018-01-09 19:34:58 +01:00