From: rinpatch <rin@patch.cx>
Date: Tue, 16 Feb 2021 10:11:41 +0000 (+0000)
Subject: Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=13e324abe9af5d58137adda7caec115ed3305e95;hp=284504f689b03e23f7db0033a53dbf953663e395;p=akkoma

Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'

[#2053] `Notification.for_user_query/2` timeout fix

Closes #2053

See merge request pleroma/pleroma!3318
---

diff --git a/.mailmap b/.mailmap
index e4ca5f9b5..84fffaee7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
 Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
 Ariadne Conill <ariadne@dereferenced.org> <nenolod@gmail.com>
+rinpatch <rin@patch.cx> <rinpatch@sdf.org>