mastodon/app/views
Thibaut Girka e9ad99bc93 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
2020-07-07 15:58:45 +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 Fix lock icon not being shown when locking account in profile settings (#14190) 2020-07-01 13:51:50 +02:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2020-05-13 22:11:49 +02:00
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2020-07-07 15:58:45 +02:00
media Add color extraction for audio thumbnails (#14209) 2020-07-05 18:28:25 +02:00
notification_mailer
oauth
public_timelines Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
relationships
remote_follow
remote_interaction
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
shared
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-07-05 19:35:56 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-04-20 16:45:40 +02:00
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