Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +02:00

..

_attachment_list.html.haml

Add attachment list fallback to public pages (#9780)

2019-01-13 09:23:54 +00:00

_detailed_status.html.haml

Put poll options behind content warnings (#10983)

2019-06-08 17:40:59 +02:00

_og_description.html.haml

Add description meta tag additionally to og:description (#8941)

2018-10-10 02:21:30 +02:00

_og_image.html.haml

add og:image:alt for media attachments in embeds (#10779)

2019-05-18 20:57:45 +02:00

_poll.html.haml

Add support for custom emojis in poll options (#10322)

2019-03-20 17:29:12 +01:00

_simple_status.html.haml

Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 18:59:53 +02:00

_status.html.haml

Revert Font Awesome 5 upgrade (#8810)

2018-09-28 02:11:14 +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

Fix og:url on toots' public view (#9047)

2018-10-21 22:52:10 +02:00