forked from glitch-soc-github-mirror/mastodon
Conflicts: - `tsconfig.json`: glitch-soc had extra paths under `app/javascript/flavours`, but upstream added `app/javascript` as a whole, so updated to upstream's. |
||
---|---|---|
.. | ||
admin | ||
api | ||
auth | ||
concerns | ||
oauth | ||
settings | ||
application_controller_spec.rb | ||
authorize_interactions_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
relationships_controller_spec.rb |