Merge branch 'develop' into global-status-expiration
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Jun 2020 13:21:47 +0000 (17:21 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 8 Jun 2020 13:21:47 +0000 (17:21 +0400)
commitda22119c2ffd14098611b1691dc70110431527b5
treef1faf8794cc66837b0db813f86666b256e4fa6fb
parenta7627bdc7ae67a5c103f968eea02d6b1cf1ef8da
parentd1924926585a477682b8fcc3176521dacb0766dd
Merge branch 'develop' into global-status-expiration
config/config.exs
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/activity_pub/activity_pub_test.exs