Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 16 Mar 2020 14:58:42 +0000 (17:58 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 16 Mar 2020 14:58:42 +0000 (17:58 +0300)
1  2 
lib/pleroma/user.ex

Simple merge