Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Tue, 2 Jun 2020 12:28:01 +0000 (14:28 +0200)
committerlain <lain@soykaf.club>
Tue, 2 Jun 2020 12:28:01 +0000 (14:28 +0200)
commit904295d53b82fcfd7dfefd4c970815b36f06faf0
tree14304475f45ad45ddad672b16d44b763bf265bc4
parent37542a9dfa99cc4324f211b45254acea758ac1ae
parentcd2abcc0e3a67898fbadd073ff778e7342c09709
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
lib/pleroma/web/activity_pub/activity_pub.ex