mirror of https://github.com/tootsuite/mastodon
02062aab55
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb |
||
---|---|---|
.. | ||
about | ||
accounts | ||
admin | ||
admin_mailer | ||
application | ||
auth | ||
authorize_interactions | ||
directories | ||
errors | ||
filters | ||
follower_accounts | ||
following_accounts | ||
home | ||
invites | ||
kaminari | ||
layouts | ||
media | ||
notification_mailer | ||
oauth | ||
public_timelines | ||
remote_follow | ||
remote_interaction | ||
remote_unfollows | ||
settings | ||
shared | ||
shares | ||
stream_entries | ||
tags | ||
user_mailer | ||
well_known |