Merge branch 'develop' into '1865-media-only'
authorlain <lain@soykaf.club>
Sat, 20 Jun 2020 09:33:18 +0000 (09:33 +0000)
committerlain <lain@soykaf.club>
Sat, 20 Jun 2020 09:33:18 +0000 (09:33 +0000)
commit7d542450b13742c6efa93246c172c8306e730d50
tree86998336bba747f1ce605a1c06e39ac96f38b396
parent4733f6a3371504ebb3eeb447d7c20d56c10b43bf
parentf9282677731cca96a1316e2830507837535c06e0
Merge branch 'develop' into '1865-media-only'

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