Merge branch 'develop' into 'reactions'
authorlain <lain@soykaf.club>
Thu, 10 Oct 2019 12:38:51 +0000 (12:38 +0000)
committerlain <lain@soykaf.club>
Thu, 10 Oct 2019 12:38:51 +0000 (12:38 +0000)
commitd7f9679ff2c9c4bd2b9967d7a32b5a4fe145305e
treef99394ee5d40b8c1bff6301acd683e13dc23edc8
parent6c278cfe09fb9fd5220743d8f69c6e232623a09b
parent9fd5176c35d21846fb8368ea7bc0285f9cd74ad4
Merge branch 'develop' into 'reactions'

# Conflicts:
#   CHANGELOG.md
CHANGELOG.md
lib/pleroma/web/activity_pub/activity_pub.ex