Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring		2022-12-15 20:25:25 +01:00
..
active_record	…
assets	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
rails	…
redis	…
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	2022-04-11 09:06:25 +02:00
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-12-15 20:25:25 +01:00
templates	…
terrapin	…
webpacker	…
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
exceptions.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00