Merge branch 'preloadfixups' into 'develop'
authorlain <lain@soykaf.club>
Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)
committerlain <lain@soykaf.club>
Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)
commitb9e6ad571ac5925431466d6e6b27c0b372bb7727
tree371580ce4b3f72dff2b207119307f95e634ac2de
parent34c9446cb17cd11a6d141d9e4b6bce8ac042de77
parent8b7055e25e76565cd3376c0b5dda5e54d24881f0
Merge branch 'preloadfixups' into 'develop'

Some fixups for the preload.

See merge request pleroma/pleroma!2692