mirror of https://github.com/tootsuite/mastodon
1c9c0167b7
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
application | ||
auth | ||
authorize_follows | ||
errors | ||
follower_accounts | ||
following_accounts | ||
home | ||
invites | ||
kaminari | ||
layouts | ||
media | ||
notification_mailer | ||
oauth | ||
remote_follow | ||
remote_unfollows | ||
settings | ||
shared | ||
shares | ||
stream_entries | ||
tags | ||
user_mailer | ||
well_known |