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 | ||
| preferences | ||
| two_factor_authentication | ||
| applications_controller_spec.rb | ||
| deletes_controller_spec.rb | ||
| exports_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| flavours_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| imports_controller_spec.rb | ||
| migrations_controller_spec.rb | ||
| profiles_controller_spec.rb | ||
| sessions_controller_spec.rb | ||
| two_factor_authentication_methods_controller_spec.rb | ||