ff73d43b35
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
api | ||
auth | ||
concerns | ||
disputes | ||
oauth | ||
settings | ||
well_known | ||
about_controller.rb | ||
account_follow_controller.rb | ||
account_unfollow_controller.rb | ||
accounts_controller.rb | ||
application_controller.rb | ||
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 | ||
health_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_cleanup_controller.rb | ||
statuses_controller.rb | ||
tags_controller.rb |