Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
authorEgor Kislitsyn <egor@kislitsyn.com>
Tue, 14 May 2019 12:00:07 +0000 (19:00 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Tue, 14 May 2019 12:00:07 +0000 (19:00 +0700)
commite82e73478e577782407bc8452d17925675d99d10
tree0784beff0a57cbeb239215314e0436b7f0a5253f
parent23276e8d6848fa8eae390c16b6e0619c12546e4a
parentcdcdbd88da76f18c21da7f6f15a29883044902c8
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/publisher.ex
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/common_api/common_api.ex
lib/pleroma/web/common_api/utils.ex
lib/pleroma/web/salmon/salmon.ex