mastodon/app/views
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
2020-04-02 20:32:00 +02:00
..
about
accounts
admin
admin_mailer
application
auth
authorize_interactions
directories
errors
filters
follower_accounts
following_accounts
home
invites
kaminari
layouts
media
notification_mailer
oauth
public_timelines
relationships
remote_follow
remote_interaction
settings
shared
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
tags
user_mailer
well_known/host_meta