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)
1  2 
config/config.exs
config/description.exs
lib/pleroma/web/mastodon_api/views/status_view.ex

Simple merge
Simple merge