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 b3bf32a21e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system.		2022-01-17 10:45:25 +01:00
..
chewy	…
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
mailers	Add notifications for statuses deleted by moderators (#17204)	2022-01-17 09:41:33 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
policies	…
presenters	…
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 10:45:25 +01:00