Merge branch 'develop' into support/tests
authorMaksim Pechnikov <parallel588@gmail.com>
Sun, 15 Sep 2019 11:07:07 +0000 (14:07 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sun, 15 Sep 2019 11:22:15 +0000 (14:22 +0300)
commit8751809e1e96644a4d38694504622d2115966230
tree3e1a969100bbf8a75f37c7e10d48ca97eb381db2
parent39f99dc6cd9295e1b62b27ed1566d53c8c0291fc
parent9c64a25713790fefa8b5c419aeadf55113c17073
Merge branch 'develop' into support/tests
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/utils.ex