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 dbe311f0e9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.pl.yml		6 years ago
..
assets	…
devise	…
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	…
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