From: stwf <steven.fuchs@dockyard.com>
Date: Wed, 3 Jun 2020 21:25:53 +0000 (-0400)
Subject: Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=906ac57ba8246322b0545c51e498559809710146;p=akkoma

Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data

# Conflicts:
#	lib/pleroma/web/preload/status_net.ex
---

906ac57ba8246322b0545c51e498559809710146