Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data
authorstwf <steven.fuchs@dockyard.com>
Wed, 3 Jun 2020 21:25:53 +0000 (17:25 -0400)
committerstwf <steven.fuchs@dockyard.com>
Wed, 3 Jun 2020 21:25:53 +0000 (17:25 -0400)
commit906ac57ba8246322b0545c51e498559809710146
treeb84f24d8bb64adeb972be8a6adf2388a2ce641d9
parent5677b21e824aa7f3b5124068ef65041e04002579
parentaa26dc6a130614b049696784ecb29e341956bbc2
Merge branch 'preload-data' of git.pleroma.social:stwf/pleroma into preload-data

# Conflicts:
# lib/pleroma/web/preload/status_net.ex
config/config.exs