From: Roger Braun Date: Sun, 12 Nov 2017 13:23:39 +0000 (+0100) Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=5fc6e9d467f69af155627cccaa27616fe7ffc61f;p=akkoma Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop --- 5fc6e9d467f69af155627cccaa27616fe7ffc61f diff --cc lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex index a05680205,000000000..334dc4f98 mode 100644,000000..100644 --- a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex +++ b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex @@@ -1,21 -1,0 +1,18 @@@ + + + + + + + + + + + - - + + + +

+ +