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 f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
7 years ago
..
assets Add emoji autosuggest (#5053) 9 years ago
devise Fix wrong string being used on login failure when using LDAP (#8534) 8 years ago
generators Add post-deployment migration system (#8182) 8 years ago
json_ld Preload common JSON-LD contexts (#9412) 7 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
paperclip Unconditionally re-encode locally-uploaded images to strip metadata 8 years ago
tasks Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
templates Add post-deployment migration system (#8182) 8 years ago
cli.rb Add `tootctl --version` (#9835) 7 years ago