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 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
fabricators	…
features	…
fixtures	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
helpers	…
lib	…
mailers	…
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
policies	…
presenters	…
requests	…
routing	…
serializers/activitypub	…
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
support	…
validators	…
views/statuses	…
workers	…
rails_helper.rb	…
spec_helper.rb	…