This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
development.rb	…
production.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
test.rb	…