Merge branch 'preload-data' into 'develop'
authorfeld <feld@feld.me>
Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)
committerfeld <feld@feld.me>
Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381

1  2 
config/config.exs
lib/pleroma/web/router.ex
test/web/node_info_test.exs

Simple merge
Simple merge
Simple merge