mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-30 23:49:04 +01:00
f3a4d57be1
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
---|---|---|
.. | ||
aliases | ||
applications | ||
deletes | ||
exports | ||
featured_tags | ||
flavours | ||
imports | ||
login_activities | ||
migration/redirects | ||
migrations | ||
preferences | ||
profiles | ||
shared | ||
two_factor_authentication | ||
two_factor_authentication_methods |