Merge pull request #4193 from AntonKhorev/lookup-friend

author Andy Allan <git@gravitystorm.co.uk>

Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)

committer GitHub <noreply@github.com>

Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)
author Andy Allan <git@gravitystorm.co.uk>
Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)
committer GitHub <noreply@github.com>
Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)
diff --cc app/controllers/friendships_controller.rb
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)
committer	GitHub <noreply@github.com>
	Wed, 30 Aug 2023 14:17:11 +0000 (15:17 +0100)