You cannot 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 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Upstream added the `bug` label to bug reports. Did the same. - `app/services/fan_out_on_write_service.rb`: Upstream put DMs back into timelines, glitch-soc was already doing it. Ignored upstream changes.		5 years ago
..
exports	Add import/export feature for bookmarks (#14956)	5 years ago
migration	Refactor settings controllers (#14767)	5 years ago
preferences	…
two_factor_authentication	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
aliases_controller.rb	Refactor settings controllers (#14767)	5 years ago
applications_controller.rb	Refactor settings controllers (#14767)	5 years ago
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
deletes_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	5 years ago
exports_controller.rb	Refactor settings controllers (#14767)	5 years ago
featured_tags_controller.rb	Refactor settings controllers (#14767)	5 years ago
flavours_controller.rb	…
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
imports_controller.rb	Refactor settings controllers (#14767)	5 years ago
migrations_controller.rb	Refactor settings controllers (#14767)	5 years ago
pictures_controller.rb	Refactor settings controllers (#14767)	5 years ago
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
profiles_controller.rb	Refactor settings controllers (#14767)	5 years ago
sessions_controller.rb	Refactor settings controllers (#14767)	5 years ago
two_factor_authentication_methods_controller.rb	Refactor settings controllers (#14767)	5 years ago