Merge branch 'develop' into media-preview-proxy
authorMark Felder <feld@FreeBSD.org>
Thu, 3 Sep 2020 15:34:06 +0000 (10:34 -0500)
committerMark Felder <feld@FreeBSD.org>
Thu, 3 Sep 2020 15:34:06 +0000 (10:34 -0500)
commit85446cc30c97a326d90b4ef719ba2e54c2ad423f
treecaa8e1268cbab2a09e414b85d2ce52b24249d0da
parent6ce28c409137972ee9b105b9d7ab4a0fd2a0d08b
parent9433311923d4b41b057ce6cb1632ff27d46919b4
Merge branch 'develop' into media-preview-proxy
config/config.exs
config/description.exs
lib/pleroma/web/mastodon_api/views/account_view.ex
lib/pleroma/web/mastodon_api/views/status_view.ex
mix.lock