mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 14:43:42 +01:00
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. |
||
---|---|---|
.. | ||
aliases | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
identity_proofs | ||
imports | ||
migration/redirects | ||
migrations | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentication_methods |