mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-19 08:28:55 +00:00
1682ac5717
Conflicts: - app/controllers/following_accounts_controller.rb Conflicts were due to glitch-soc's theming system. - app/javascript/packs/public.js Some code has been change upstream, but it has been moved to app/javascript/core/settings.js in glitch-soc. Applied the changes there. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
oauth | ||
settings | ||
well_known | ||
about_controller_spec.rb | ||
account_follow_controller_spec.rb | ||
account_unfollow_controller_spec.rb | ||
accounts_controller_spec.rb | ||
application_controller_spec.rb | ||
authorize_interactions_controller_spec.rb | ||
emojis_controller_spec.rb | ||
follower_accounts_controller_spec.rb | ||
following_accounts_controller_spec.rb | ||
home_controller_spec.rb | ||
intents_controller_spec.rb | ||
invites_controller_spec.rb | ||
manifests_controller_spec.rb | ||
media_controller_spec.rb | ||
relationships_controller_spec.rb | ||
remote_follow_controller_spec.rb | ||
remote_interaction_controller_spec.rb | ||
remote_unfollows_controller_spec.rb | ||
shares_controller_spec.rb | ||
statuses_controller_spec.rb | ||
stream_entries_controller_spec.rb | ||
tags_controller_spec.rb |