Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 6 Dec 2020 10:59:35 +0000 (13:59 +0300)
commita010c5b16a395d823a98cd088c83acd098930ade
tree082ad643a5cb30ddc9e356c2b0ce376a2fe0899b
parente9859b68fcb9c38b2ec27a45ffe0921e8d78b5e1
parentb3ee618e0d726452248c6fa9a1830d2525b9693b
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
CHANGELOG.md
lib/pleroma/user.ex
test/pleroma/user_test.exs