Merge remote-tracking branch 'origin/develop' into conversations-import
authorlain <lain@soykaf.club>
Wed, 15 May 2019 15:47:29 +0000 (17:47 +0200)
committerlain <lain@soykaf.club>
Wed, 15 May 2019 15:47:29 +0000 (17:47 +0200)
commitf168a1cbdc318ffaa2d8bc9fb561eb3dfdfb89d9
tree3c208baf52e27859491cce07954ac9b1198cbc8f
parent786f2c7a849bc4fa2bd4aac18de59ef6b2ed18c5
parent62516be9c462ca206163eaf7822f9ee5c2470453
Merge remote-tracking branch 'origin/develop' into conversations-import
lib/pleroma/conversation.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/visibility.ex
test/conversation_test.exs
test/web/activity_pub/visibilty_test.exs