You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/lib
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
5 years ago
..
assets Add emoji autosuggest (#5053) 8 years ago
chewy/strategy Fix records not being indexed sometimes (#12024) 6 years ago
devise Fix authentication before 2FA challenge (#11943) 6 years ago
generators Add post-deployment migration system (#8182) 7 years ago
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
paperclip Add customizable thumbnails for audio and video attachments (#14145) 5 years ago
tasks Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
templates Add post-deployment migration system (#8182) 7 years ago
cli.rb Fix help text around `tootctl email_domain_blocks` (#14147) 5 years ago