From: raeno Date: Fri, 14 Dec 2018 19:28:35 +0000 (+0100) Subject: Merge branch 'develop' into oembed_provider X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=90b00701ff0e2622825ef4c86409a27691763baf;p=akkoma Merge branch 'develop' into oembed_provider --- 90b00701ff0e2622825ef4c86409a27691763baf diff --cc priv/static/index.html index 4ae1afc82,aad8f1697..5958e16b1 --- a/priv/static/index.html +++ b/priv/static/index.html @@@ -1,1 -1,1 +1,1 @@@ - Pleroma
-Pleroma
++Pleroma