From: sadposter Date: Tue, 10 Sep 2019 20:11:03 +0000 (+0100) Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=94076a23e40f74256fec507e6236aaff10218277;p=akkoma Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop --- 94076a23e40f74256fec507e6236aaff10218277 diff --cc priv/static/index.html index ed72fee9e,f681f4def..be5b7d729 --- a/priv/static/index.html +++ b/priv/static/index.html @@@ -1,1 -1,1 +1,1 @@@ - Pleroma
-Pleroma
++Pleroma