Merge branch 'develop' into feature/hide-follows-remote
authorrinpatch <rinpatch@sdf.org>
Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)
committerrinpatch <rinpatch@sdf.org>
Thu, 25 Jul 2019 15:43:30 +0000 (18:43 +0300)
commit41e0304757c5a0d9778f7e685c9ddf481f0e15cb
treedc60d86d41153d9764cb32a9adae5fa24894c1fa
parent196cad46f35a63c18d58cd5d982bc4e1f9b0d7c3
parentd1e891062e3c6c34ca7940a476917beea2822ca2
Merge branch 'develop' into feature/hide-follows-remote
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs