a5127d0ef8
Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did. |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
application | ||
auth | ||
custom_css | ||
disputes/strikes | ||
errors | ||
filters | ||
follower_accounts | ||
following_accounts | ||
home | ||
invites | ||
kaminari | ||
layouts | ||
mail_subscriptions | ||
media | ||
notification_mailer | ||
oauth | ||
privacy | ||
redirects | ||
relationships | ||
remote_interaction_helper | ||
settings | ||
shared | ||
shares | ||
statuses | ||
statuses_cleanup | ||
tags | ||
user_mailer | ||
well_known/host_meta | ||
.rubocop.yml |