Merge branch 'develop' into feature/hide-follows-remote
authorrinpatch <rinpatch@sdf.org>
Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)
committerrinpatch <rinpatch@sdf.org>
Wed, 31 Jul 2019 11:12:29 +0000 (14:12 +0300)
commitc88a5d32514f4ed78e4b9216198db62e8799ffe4
treebc979f2522156be74138491114892e7acbeaafcb
parent41e0304757c5a0d9778f7e685c9ddf481f0e15cb
parent66575061851f13355958fd292ee545462bf191c0
Merge branch 'develop' into feature/hide-follows-remote
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/transmogrifier.ex