Merge branch 'develop' into issue/2099
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 17 Sep 2020 05:41:35 +0000 (08:41 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 17 Sep 2020 05:41:35 +0000 (08:41 +0300)
commitb867f9d7aebc4e5b8832228a54f928b9f92dad0e
treeee00341390c7e3382092a8f4191485f15067f943
parent917d325972e3aeb367583c61aaa109d62fcba837
parentc5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b
Merge branch 'develop' into issue/2099
lib/pleroma/user.ex
test/user_test.exs