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 e4ca5f9b589d8b6a1aeb815b9a146f7222e250ad..84fffaee78f6b3535a362562c1a4fd059c508742 100644 (file)
--- 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>