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)
commit26f710b9e36d286ee34dd679fdaf99e39d8c0bf2
tree168a4f0522a19d424aaaefa0c85e63139c8fead2
parenta42d135cce3e6326cd8a16f08f4ab83633386c2e
parente2793744c5dced3ced98acb21a2ef2b13ab65ac9
Merge branch 'develop' into preload-data
config/config.exs
lib/pleroma/web/router.ex