Merge branch 'develop' into feld-2168-media-preview-proxy
authorMark Felder <feld@FreeBSD.org>
Tue, 25 Aug 2020 16:57:23 +0000 (11:57 -0500)
committerMark Felder <feld@FreeBSD.org>
Tue, 25 Aug 2020 16:57:23 +0000 (11:57 -0500)
commit479578b148f28f311a7d20f6da99bbc0dab1652c
tree2b0e5bfe6bfa5c4b954b9442d4d2a1d4ad4bc8cf
parent98f8851f29f940051656caa1715820bce70f8c29
parent361aa22e2862c1c914baf8257fdc8b20cbc7941d
Merge branch 'develop' into feld-2168-media-preview-proxy
config/config.exs
config/description.exs
lib/pleroma/web/mastodon_api/views/status_view.ex