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 |
||
---|---|---|
.. | ||
accounts | ||
apps | ||
instances | ||
lists | ||
polls | ||
push | ||
statuses | ||
timelines | ||
accounts_controller.rb | ||
apps_controller.rb | ||
blocks_controller.rb | ||
bookmarks_controller.rb | ||
conversations_controller.rb | ||
custom_emojis_controller.rb | ||
domain_blocks_controller.rb | ||
endorsements_controller.rb | ||
favourites_controller.rb | ||
filters_controller.rb | ||
follow_requests_controller.rb | ||
follows_controller.rb | ||
instances_controller.rb | ||
lists_controller.rb | ||
media_controller.rb | ||
mutes_controller.rb | ||
notifications_controller.rb | ||
polls_controller.rb | ||
reports_controller.rb | ||
scheduled_statuses_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb | ||
streaming_controller.rb | ||
suggestions_controller.rb |