mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 20:03:24 +00:00
fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
aliases | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
imports | ||
login_activities | ||
migration/redirects | ||
migrations | ||
preferences | ||
privacy | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentication_methods | ||
verifications |