Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 1 Jun 2020 13:38:57 +0000 (17:38 +0400)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 1 Jun 2020 13:38:57 +0000 (17:38 +0400)
commit6b84c62d4a51cb17192945d1b67999b2c56a23d2
tree53744600bd910bb0a62be6ab5884c6972da2ffce
parentcb8236cda62cddb72f4320af6347defae44b81ca
parente96765df6b04fe5e9766271a9c62e559392758b2
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
lib/pleroma/constants.ex
lib/pleroma/web/router.ex
lib/pleroma/web/templates/embed/show.html.eex
lib/pleroma/web/templates/layout/embed.html.eex
lib/pleroma/web/views/embed_view.ex