luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-02 13:04:37 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/views/admin/trends/links
History
Claire ff73d43b35 Merge branch 'main' into glitch-soc/merge-upstream 
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.
2022-04-08 19:53:32 +02:00
..
preview_card_providers Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00
_preview_card.html.haml Fix trends returning less results per page when filtered in REST API (#17996) 2022-04-08 17:10:53 +02:00
index.html.haml Merge branch 'main' into glitch-soc/merge-upstream 2022-03-02 20:48:27 +01:00