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 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock		6 years ago
..
assets	…
devise	Fix wrong string being used on login failure when using LDAP (#8534)	6 years ago
generators	…
json_ld	Preload common JSON-LD contexts (#9412)	6 years ago
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
paperclip	Unconditionally re-encode locally-uploaded images to strip metadata	6 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
templates	…
cli.rb	Do not remove "dead" domains in tootctl accounts cull (#9108)	6 years ago