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)
commit0e07c5ef5717460d37336129cb657ba11091f09d
tree801cb7957ebe2e4f227f089afc902ea2084eaf27
parent7c8003c3fcdcab075b9722ab236bf2d1d0e0e8cd
parentb80958d4e3fb9cdbb9b10149a52f1441edb4b1e3
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
lib/pleroma/user.ex