mastodon/app/views/stream_entries
Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/workers/activitypub/distribute_poll_update_worker.rb
- config/locales/pl.yml
2019-03-28 13:01:33 +01:00
..
_attachment_list.html.haml
_detailed_status.html.haml
_og_description.html.haml
_og_image.html.haml
_poll.html.haml
_simple_status.html.haml Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
_status.html.haml
embed.html.haml
show.html.haml