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 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline		5 years ago
..
assets	Add emoji autosuggest (#5053)	7 years ago
chewy/strategy	Fix records not being indexed sometimes (#12024)	5 years ago
devise	Fix authentication before 2FA challenge (#11943)	5 years ago
generators	Add post-deployment migration system (#8182)	6 years ago
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
paperclip	Fix performance of GIF re-encoding (#12057)	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
templates	Add post-deployment migration system (#8182)	6 years ago
cli.rb	Add `tootctl preview_cards remove` (#11320)	5 years ago