From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 23 Apr 2017 08:37:22 +0000 (+0200)
Subject: Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=361a8c42197a92f044fc3d0ceadeee5e3590e96f;p=akkoma

Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
---

361a8c42197a92f044fc3d0ceadeee5e3590e96f
diff --cc lib/pleroma/web/router.ex
index 99d1f69c2,6a2b37aec..c2cec1d85
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -50,14 -58,7 +62,14 @@@ defmodule Pleroma.Web.Router d
      post "/favorites/create/:id", TwitterAPI.Controller, :favorite
      post "/favorites/create", TwitterAPI.Controller, :favorite
      post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite
-     post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet
+ 
      post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar
    end
 +
 +  scope "/.well-known", Pleroma.Web do
 +    pipe_through :well_known
 +
 +    get "/host-meta", WebFinger.WebFingerController, :host_meta
 +    get "/webfinger", WebFinger.WebFingerController, :webfinger
 +  end
  end