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

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/router.ex
index 99d1f69c269273bb581fef248e395536ed56b9fa,6a2b37aecd6c104f662099f3cb51ec6acf004dca..c2cec1d85ef36e1435008066889e21b71c8ea913
--- 1/lib/pleroma/web/router.ex
--- 2/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

diff --cc lib/pleroma/web/twitter_api/representers/user_representer.ex
Simple merge