Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)
committerlain <lain@soykaf.club>
Mon, 27 Apr 2020 10:07:08 +0000 (12:07 +0200)
commitc86143ed73ba5b2d8d373607ca706f1a428f3fe4
treee86641043e676803ffc27a57ce23c29a71347063
parenta51cdafc0192b66ce75659b424a690f52c9b2a49
parent01cc93b6873b5c50c0fc54774a3b004bf660e46b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex
test/web/common_api/common_api_test.exs