mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
![]() 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. |
||
---|---|---|
.. | ||
base.rb | ||
history.rb | ||
links.rb | ||
preview_card_batch.rb | ||
preview_card_filter.rb | ||
preview_card_provider_batch.rb | ||
preview_card_provider_filter.rb | ||
query.rb | ||
status_batch.rb | ||
status_filter.rb | ||
statuses.rb | ||
tag_batch.rb | ||
tag_filter.rb | ||
tags.rb |