mastodon/app/views
Thibaut Girka 34b8346e7f Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
..
about
accounts
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
remote_unfollows
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-05-26 15:41:40 +02:00
shared
shares
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
tags
user_mailer
well_known