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)
1  2 
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex

Simple merge