Merge branch 'develop' into support/tests
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 7 Sep 2019 19:13:43 +0000 (22:13 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 7 Sep 2019 19:13:43 +0000 (22:13 +0300)
commit39f99dc6cd9295e1b62b27ed1566d53c8c0291fc
tree48e0f59948462378451f09fc4307777d5080e58b
parentae506ca997619f118d18703a9b0802246eb427d5
parentc45013df8e53334bcc1afb8cd1df673c290037ee
Merge branch 'develop' into support/tests
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex