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
..
active_record
assets	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
rails
redis
sanitize_ext
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-14 08:35:55 +01:00
templates
terrapin
webpacker
cli.rb
enumerable.rb
exceptions.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00