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 ab5ff638f2 Merge branch 'master' into glitch-soc/master ... Conflicts: - `config/locales/en.yml` No real conflict, upstream added a translatable string “too close” to one specific to glitch-soc - `lib/mastodon/statuses_cli.rb` Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses - `package.json` No real conflict, additional dependency in glitch-soc		5 years ago
..
aliases	Add account migration UI (#11846)	5 years ago
applications	…
deletes	…
exports	Use different strings on exports page (#12569)	5 years ago
featured_tags	…
flavours	…
identity_proofs	…
imports	…
migration/redirects	…
migrations	…
preferences	…
profiles	…
shared	…
two_factor_authentication	…
two_factor_authentications	…