mastodon/app/views
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-06-26 13:02:14 +02:00
admin_mailer
application
auth Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media Fix various issues around OpenGraph representation of media (#14133) 2020-06-25 01:33:01 +02:00
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings
shared
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
tags
user_mailer Add e-mail-based sign in challenge for users with disabled 2FA (#14013) 2020-06-09 10:23:06 +02:00
well_known/host_meta