FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views/stream_entries
History
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 Add attachment list fallback to public pages (#9780) 2019-01-13 09:23:54 +00:00
_detailed_status.html.haml Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401) 2019-03-28 04:44:59 +01:00
_og_description.html.haml
…
_og_image.html.haml
…
_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-03-28 13:01:33 +01:00
_status.html.haml
…
embed.html.haml
…
show.html.haml
…