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 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		5 years ago
..
aliases	…
applications	…
deletes	…
exports	…
featured_tags	…
flavours	…
identity_proofs	…
imports	…
migration/redirects	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	5 years ago
preferences	…
profiles	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
two_factor_authentication	…
two_factor_authentications	…