luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-07 23:44:33 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/stream_entries
History
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
_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
embed.html.haml
show.html.haml