You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 050efbc126 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml		6 years ago
..
_attachment_list.html.haml	…
_detailed_status.html.haml	Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)	6 years ago
_og_description.html.haml	…
_og_image.html.haml	…
_poll.html.haml	…
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
_status.html.haml	…
embed.html.haml	…
show.html.haml	…