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 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.		6 years ago
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	6 years ago
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	…
tasks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
templates	…
cli.rb	Add `tootctl --version` (#9835)	6 years ago