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 b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		2021-12-16 16:20:44 +01:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
post_migrate	…
views	…
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
seeds.rb	…