David Yip 020b40efdb Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml		2018-02-09 09:25:53 -06:00
..
_content_spoiler.html.haml	Merge upstream!! #64 <3 <3	2017-07-12 02:03:17 -07:00
_detailed_status.html.haml	Add preference to always display sensitive media (#6448)	2018-02-09 00:26:57 +01:00
_media.html.haml	Images now behind CWs on static pages	2017-06-29 22:59:28 -07:00
_og_description.html.haml	Clean up and improve generated OpenGraph tags (#4901)	2017-09-12 05:39:38 +02:00
_og_image.html.haml	Fix #5050 - Use summary_large_image only with media attachments (#5219)	2017-10-04 19:06:23 +02: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	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	Fix #6204: Use content warning for page title when present (#6231)	2018-01-09 19:34:58 +01:00