mirror of https://github.com/tootsuite/mastodon
48f0f3ffee
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. |
||
---|---|---|
.. | ||
exports | ||
migration | ||
preferences | ||
two_factor_authentication | ||
aliases_controller.rb | ||
applications_controller.rb | ||
base_controller.rb | ||
deletes_controller.rb | ||
exports_controller.rb | ||
featured_tags_controller.rb | ||
flavours_controller.rb | ||
identity_proofs_controller.rb | ||
imports_controller.rb | ||
migrations_controller.rb | ||
pictures_controller.rb | ||
preferences_controller.rb | ||
profiles_controller.rb | ||
sessions_controller.rb | ||
two_factor_authentication_methods_controller.rb |