From: lain <lain@soykaf.club>
Date: Sat, 16 May 2020 17:07:09 +0000 (+0000)
Subject: Merge branch 'develop' into 'remove-twitter-api'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d15aa9d9503e59b3cd0731394855781f435ec63c;p=akkoma

Merge branch 'develop' into 'remove-twitter-api'

# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
---

d15aa9d9503e59b3cd0731394855781f435ec63c