mastodon/app/views
Thibaut Girka 9044a2b051 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/directories/index.html.haml
  Upstream has redesigned the profile directory, and we
  had a glitch-soc-specific change to hide follower counts.
  Ported that change to the new design.
2019-08-30 13:38:41 +02:00
..
about
accounts
admin
admin_mailer
application
auth
authorize_interactions
directories Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-08-30 13:38:41 +02:00
shared
shares
statuses
tags
user_mailer
well_known/host_meta