Merge branch 'preload-fixups-2' into preloadfixups
authorlain <lain@soykaf.club>
Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)
committerlain <lain@soykaf.club>
Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)
commit0176b7bca2e64f82228129024ac059e3bee00675
treec7e092a07c8ec5d672142dc56a72fae8981422f3
parent8630a6c7f52a68ab32025b1c80a6398599908c68
parent2382a2a1511e1042d960946aacfde7a49fac9dd0
Merge branch 'preload-fixups-2' into preloadfixups
lib/pleroma/web/preload/instance.ex
test/web/preload/instance_test.exs