Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 May 2020 17:27:03 +0000 (20:27 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 20 May 2020 17:27:03 +0000 (20:27 +0300)
commit6fd4f58ead9189697ed004b6ca593d5ba746898f
tree447bf02a1bc76941686e2017b6b8bed4494737d4
parent1871a5ddb4a803ebe4fae6943a9b9c94f1f9c1a8
parent265746b21f5a58f49efbdbe9d9eecd697781b93b
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
config/config.exs
lib/pleroma/web/mastodon_api/views/status_view.ex
lib/pleroma/web/router.ex
mix.exs
mix.lock