Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.

2021-03-02 12:06:58 +01:00

..

accounts

…

admin

…

announcements

…

apps

…

crypto

…

emails

…

featured_tags

…

instances

…

lists

…

polls

…

push

…

statuses

…

timelines

…

accounts_controller.rb

…

announcements_controller.rb

…

apps_controller.rb

…

blocks_controller.rb

…

bookmarks_controller.rb

…

conversations_controller.rb

…

custom_emojis_controller.rb

…

directories_controller.rb

…

domain_blocks_controller.rb

…

endorsements_controller.rb

…

favourites_controller.rb

…

featured_tags_controller.rb

…

filters_controller.rb

…

follow_requests_controller.rb

…

instances_controller.rb

…

lists_controller.rb

…

markers_controller.rb

…

media_controller.rb

…

mutes_controller.rb

…

notifications_controller.rb

…

polls_controller.rb

…

preferences_controller.rb

…

reports_controller.rb

…

scheduled_statuses_controller.rb

…

statuses_controller.rb

…

streaming_controller.rb

…

suggestions_controller.rb

…

trends_controller.rb

…