Claire c118918520 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/custom_emoji.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific validation. Applied upstream changes. - `app/models/public_feed.rb`: Not a real conflict, just upstream changing a line too close to a glitch-soc-specific parameter documentation. Applied upstream changes.		2022-11-10 09:36:47 +01:00
..
credentials_controller.rb
familiar_followers_controller.rb
featured_tags_controller.rb
follower_accounts_controller.rb
following_accounts_controller.rb
identity_proofs_controller.rb
lists_controller.rb
lookup_controller.rb
notes_controller.rb
pins_controller.rb	Make account endorsements idempotent (fix #19045) (#20118)	2022-11-08 16:39:15 +01:00
relationships_controller.rb
search_controller.rb
statuses_controller.rb