Merge branch 'develop' into preload-data
authorMark Felder <feld@FreeBSD.org>
Fri, 12 Jun 2020 21:52:52 +0000 (16:52 -0500)
committerMark Felder <feld@FreeBSD.org>
Fri, 12 Jun 2020 21:52:52 +0000 (16:52 -0500)
1  2 
config/config.exs
lib/pleroma/web/router.ex

Simple merge
Simple merge