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 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		2021-10-14 21:44:57 +02:00
..
admin.js	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
auth.js	…
common.js	…
embed.js	…
mailer.js	…
public.js	…
settings.js	…
theme.yml	…
two_factor_authentication.js	…