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

Conflicts:
- `app/javascript/styles/mastodon/modal.scss`:
  For some reason we changed the file loading path in glitch-soc,
  but now upstream has completely changed how the logo is loaded.
  Applied upstream changes.

2021-02-12 10:28:32 +01:00

..

activitypub

…

admin

…

api

Merge branch 'main' into glitch-soc/merge-upstream

2021-02-12 10:28:32 +01:00

auth

…

concerns

…

oauth

…

settings

…

well_known

…

about_controller.rb

…

account_follow_controller.rb

…

account_unfollow_controller.rb

…

accounts_controller.rb

…

application_controller.rb

Merge branch 'main' into glitch-soc/merge-upstream

2021-02-12 10:28:32 +01:00

authorize_interactions_controller.rb

…

custom_css_controller.rb

…

directories_controller.rb

…

emojis_controller.rb

…

filters_controller.rb

…

follower_accounts_controller.rb

…

following_accounts_controller.rb

…

home_controller.rb

…

instance_actors_controller.rb

…

intents_controller.rb

…

invites_controller.rb

…

manifests_controller.rb

…

media_controller.rb

…

media_proxy_controller.rb

…

public_timelines_controller.rb

…

relationships_controller.rb

…

remote_follow_controller.rb

…

remote_interaction_controller.rb

…

shares_controller.rb

…

statuses_controller.rb

…

tags_controller.rb

…