Claire d4f25d52dd 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
..
_status.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