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 449a0727a7 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.		5 years ago
..
_attachment_list.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_detailed_status.html.haml	Fix public page crash due to audio player, fix unpause in audio player (#11652)	5 years ago
_og_description.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_og_image.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_poll.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
_simple_status.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
_status.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
embed.html.haml	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
show.html.haml	Prevent archiving when user set "noindex" (#11421)	5 years ago