From: kaniini <nenolod@gmail.com>
Date: Fri, 25 Jan 2019 05:00:47 +0000 (+0000)
Subject: Merge branch 'develop' into 'oembed_provider'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c9b418e5477229017b3750c55cf3ea3d03b7e609;p=akkoma

Merge branch 'develop' into 'oembed_provider'

# Conflicts:
#   lib/pleroma/activity.ex
---

c9b418e5477229017b3750c55cf3ea3d03b7e609